Revision: dd3e85fb2121
Author: Jean Deruelle <[email protected]>
Date: Tue Jul 10 13:31:49 2012
Log: Update Issue 116
Fixing Runtime issue discovered through HA testsuite
http://code.google.com/p/sipservlets/source/detail?r=dd3e85fb2121
Modified:
/containers/sip-servlets-jboss5-ha-server-cache/src/main/java/org/jboss/web/tomcat/service/session/distributedcache/impl/jbc/sip/AttributeBasedJBossCacheConvergedSipService.java
/containers/sip-servlets-jboss5-ha-server-cache/src/main/java/org/jboss/web/tomcat/service/session/distributedcache/impl/jbc/sip/DistributedCacheConvergedSipManagerDelegate.java
/containers/sip-servlets-jboss5-ha-server-cache/src/main/java/org/jboss/web/tomcat/service/session/distributedcache/impl/jbc/sip/SessionBasedJBossCacheConvergedSipService.java
=======================================
---
/containers/sip-servlets-jboss5-ha-server-cache/src/main/java/org/jboss/web/tomcat/service/session/distributedcache/impl/jbc/sip/AttributeBasedJBossCacheConvergedSipService.java
Thu Jul 5 07:13:19 2012
+++
/containers/sip-servlets-jboss5-ha-server-cache/src/main/java/org/jboss/web/tomcat/service/session/distributedcache/impl/jbc/sip/AttributeBasedJBossCacheConvergedSipService.java
Tue Jul 10 13:31:49 2012
@@ -55,7 +55,7 @@
DistributedCacheConvergedSipManagerDelegate<OutgoingAttributeGranularitySessionData>
delegate;
- private final ExposedJBossCacheWrapper cacheWrapper_;
+ protected final ExposedJBossCacheWrapper cacheWrapper_;
/**
* @param localManager
=======================================
---
/containers/sip-servlets-jboss5-ha-server-cache/src/main/java/org/jboss/web/tomcat/service/session/distributedcache/impl/jbc/sip/DistributedCacheConvergedSipManagerDelegate.java
Thu Jul 5 07:13:19 2012
+++
/containers/sip-servlets-jboss5-ha-server-cache/src/main/java/org/jboss/web/tomcat/service/session/distributedcache/impl/jbc/sip/DistributedCacheConvergedSipManagerDelegate.java
Tue Jul 10 13:31:49 2012
@@ -53,7 +53,7 @@
*/
public class DistributedCacheConvergedSipManagerDelegate<T extends
OutgoingDistributableSessionData> {
public static final Integer SIP_SERVLETS_METADATA_KEY =
Integer.valueOf(4);
- protected Logger log_ = Logger.getLogger(getClass());
+ protected Logger log_ =
Logger.getLogger(DistributedCacheConvergedSipManagerDelegate.class);
public static final String SIPSESSION = "SIPSESSION";
protected String sipApplicationNameHashed;
protected String sipApplicationName;
@@ -311,7 +311,7 @@
Long timestamp = (Long)
distributedCacheData.get(AbstractJBossCacheService.TIMESTAMP_KEY.toString());
DistributableSessionMetadata metadata = (DistributableSessionMetadata)
distributedCacheData
.get(AbstractJBossCacheService.METADATA_KEY.toString());
- Map<String, Object> attributes =
((DistributedCacheConvergedSipManager)jBossCacheService).getConvergedSessionAttributes(realId,
attrs);
+ Map<String, Object> attributes =
((DistributedCacheConvergedSipManager)jBossCacheService.getWrappedjBossCacheService()).getConvergedSessionAttributes(realId,
attrs);
return new IncomingDistributableSessionDataImpl(version,
timestamp,
metadata, attributes == null ?
Collections.EMPTY_MAP : attributes);
=======================================
---
/containers/sip-servlets-jboss5-ha-server-cache/src/main/java/org/jboss/web/tomcat/service/session/distributedcache/impl/jbc/sip/SessionBasedJBossCacheConvergedSipService.java
Thu Jul 5 07:13:19 2012
+++
/containers/sip-servlets-jboss5-ha-server-cache/src/main/java/org/jboss/web/tomcat/service/session/distributedcache/impl/jbc/sip/SessionBasedJBossCacheConvergedSipService.java
Tue Jul 10 13:31:49 2012
@@ -55,7 +55,6 @@
"with ReplicationGranularity " +
ReplicationGranularity.SESSION);
DistributedCacheConvergedSipManagerDelegate<OutgoingSessionGranularitySessionData>
delegate;
-
private final ExposedJBossCacheWrapper cacheWrapper_;
public SessionBasedJBossCacheConvergedSipService(
@@ -79,6 +78,11 @@
@Override
public void start() {
super.start();
+ if (log_.isDebugEnabled()) {
+ log_
+ .debug("starting delegate "
+ + delegate);
+ }
delegate.start();
}