[jboss-cvs] JBossAS SVN: r107160 - projects/cluster/ha-server-cache-ispn/trunk/src/main/java/org/jboss/ha/web/tomcat/service/session/distributedcache/impl.

[jboss-cvs-commits at lists.jboss.org]

Author: pferraro
Date: 2010-07-28 11:55:43 -0400 (Wed, 28 Jul 2010)
New Revision: 107160

Modified:
   projects/cluster/ha-server-cache-ispn/trunk/src/main/java/org/jboss/ha/web/tomcat/service/session/distributedcache/impl/DistributedCacheManagerImpl.java
   projects/cluster/ha-server-cache-ispn/trunk/src/main/java/org/jboss/ha/web/tomcat/service/session/distributedcache/impl/IncomingDistributableSessionDataImpl.java
Log:
Fix compiler warnings

Modified: projects/cluster/ha-server-cache-ispn/trunk/src/main/java/org/jboss/ha/web/tomcat/service/session/distributedcache/impl/DistributedCacheManagerImpl.java
===================================================================
--- projects/cluster/ha-server-cache-ispn/trunk/src/main/java/org/jboss/ha/web/tomcat/service/session/distributedcache/impl/DistributedCacheManagerImpl.java	2010-07-28 15:14:50 UTC (rev 107159)
+++ projects/cluster/ha-server-cache-ispn/trunk/src/main/java/org/jboss/ha/web/tomcat/service/session/distributedcache/impl/DistributedCacheManagerImpl.java	2010-07-28 15:55:43 UTC (rev 107160)
@@ -148,7 +148,7 @@
       
       CacheLoaderManagerConfig loaderManagerConfig = this.cache.getConfiguration().getCacheLoaderManagerConfig();
       
-      this.passivationEnabled = (loaderManagerConfig != null) ? loaderManagerConfig.isPassivation() && !loaderManagerConfig.isShared() : false;
+      this.passivationEnabled = (loaderManagerConfig != null) ? loaderManagerConfig.isPassivation().booleanValue() && !loaderManagerConfig.isShared().booleanValue() : false;
    }
    
    @Override

Modified: projects/cluster/ha-server-cache-ispn/trunk/src/main/java/org/jboss/ha/web/tomcat/service/session/distributedcache/impl/IncomingDistributableSessionDataImpl.java
===================================================================
--- projects/cluster/ha-server-cache-ispn/trunk/src/main/java/org/jboss/ha/web/tomcat/service/session/distributedcache/impl/IncomingDistributableSessionDataImpl.java	2010-07-28 15:14:50 UTC (rev 107159)
+++ projects/cluster/ha-server-cache-ispn/trunk/src/main/java/org/jboss/ha/web/tomcat/service/session/distributedcache/impl/IncomingDistributableSessionDataImpl.java	2010-07-28 15:55:43 UTC (rev 107160)
@@ -37,7 +37,7 @@
    private final int version;
    private final long timestamp;
    private final DistributableSessionMetadata metadata;
-   private Map<String, Object> attributes;
+   private volatile Map<String, Object> attributes;
    
    public IncomingDistributableSessionDataImpl(Integer version, Long timestamp, DistributableSessionMetadata metadata)
    {
@@ -49,31 +49,22 @@
       this.timestamp = timestamp.longValue();
       this.metadata = metadata;
    }
-   
-   public IncomingDistributableSessionDataImpl(Integer version, Long timestamp, 
-                                              DistributableSessionMetadata metadata,
-                                              Map<String, Object> attributes)
-   {
-      if (version == null)
-         throw new IllegalStateException("version is null");
-      if (timestamp == null)
-         throw new IllegalStateException("timestamp is null");
-      if (metadata == null)
-         throw new IllegalStateException("metadata is null");
-      if (attributes == null)
-         throw new IllegalStateException("attributes is null");
-      
-      this.version = version.intValue();
-      this.timestamp = timestamp.longValue();
-      this.metadata = metadata;
-      this.attributes = attributes;
-   }
 
+   /**
+    * {@inheritDoc}
+    * @see org.jboss.web.tomcat.service.session.distributedcache.spi.IncomingDistributableSessionData#providesSessionAttributes()
+    */
+   @Override
    public boolean providesSessionAttributes()
    {
       return this.attributes != null;
    }
 
+   /**
+    * {@inheritDoc}
+    * @see org.jboss.web.tomcat.service.session.distributedcache.spi.IncomingDistributableSessionData#getSessionAttributes()
+    */
+   @Override
    public Map<String, Object> getSessionAttributes()
    {
       if (this.attributes == null)
@@ -84,21 +75,40 @@
       return attributes;
    }   
 
+   /**
+    * Sets the session attributes.
+    * @param attributes a map of session attributes
+    */
    public void setSessionAttributes(Map<String, Object> attributes)
    {
       this.attributes = attributes;
    }
    
+   /**
+    * {@inheritDoc}
+    * @see org.jboss.web.tomcat.service.session.distributedcache.spi.IncomingDistributableSessionData#getMetadata()
+    */
+   @Override
    public DistributableSessionMetadata getMetadata()
    {
       return metadata;
    }
 
+   /**
+    * {@inheritDoc}
+    * @see org.jboss.web.tomcat.service.session.distributedcache.spi.IncomingDistributableSessionData#getTimestamp()
+    */
+   @Override
    public long getTimestamp()
    {
       return timestamp;
    }
 
+   /**
+    * {@inheritDoc}
+    * @see org.jboss.web.tomcat.service.session.distributedcache.spi.IncomingDistributableSessionData#getVersion()
+    */
+   @Override
    public int getVersion()
    {
       return version;