Author: kfujino
Date: Mon May 18 05:14:16 2015
New Revision: 1679936
URL: http://svn.apache.org/r1679936
Log:
Use StringManager to provide i18n support in the org.apache.catalina.ha.session
package
Modified:
tomcat/trunk/java/org/apache/catalina/ha/session/ClusterSessionListener.java
tomcat/trunk/java/org/apache/catalina/ha/session/DeltaRequest.java
tomcat/trunk/java/org/apache/catalina/ha/session/LocalStrings.properties
Modified:
tomcat/trunk/java/org/apache/catalina/ha/session/ClusterSessionListener.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/ClusterSessionListener.java?rev=1679936&r1=1679935&r2=1679936&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/ha/session/ClusterSessionListener.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/ha/session/ClusterSessionListener.java
Mon May 18 05:14:16 2015
@@ -24,6 +24,7 @@ import org.apache.catalina.ha.ClusterMan
import org.apache.catalina.ha.ClusterMessage;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
+import org.apache.tomcat.util.res.StringManager;
/**
* Receive replicated SessionMessage form other cluster node.
@@ -33,6 +34,7 @@ public class ClusterSessionListener exte
private static final Log log =
LogFactory.getLog(ClusterSessionListener.class);
+ private static final StringManager sm =
StringManager.getManager(ClusterSessionListener.class);
//--Constructor---------------------------------------------
@@ -66,8 +68,7 @@ public class ClusterSessionListener exte
//this happens a lot before the system has started
// up
if (log.isDebugEnabled())
- log.debug("Context manager doesn't exist:"
- + entry.getKey());
+
log.debug(sm.getString("clusterSessionListener.noManager", entry.getKey()));
}
}
} else {
@@ -76,7 +77,7 @@ public class ClusterSessionListener exte
mgr.messageDataReceived(msg);
} else {
if (log.isWarnEnabled())
- log.warn("Context manager doesn't exist:" + ctxname);
+
log.warn(sm.getString("clusterSessionListener.noManager", ctxname));
// A no context manager message is replied in order to
avoid
// timeout of GET_ALL_SESSIONS sync phase.
Modified: tomcat/trunk/java/org/apache/catalina/ha/session/DeltaRequest.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/DeltaRequest.java?rev=1679936&r1=1679935&r2=1679936&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/session/DeltaRequest.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/session/DeltaRequest.java Mon May
18 05:14:16 2015
@@ -142,7 +142,7 @@ public class DeltaRequest implements Ext
try {
info = actionPool.removeFirst();
}catch ( Exception x ) {
- log.error("Unable to remove element:",x);
+ log.error(sm.getString("deltaRequest.removeUnable"),x);
info = new AttributeInfo(type, action, name, value);
}
info.init(type,action,name,value);
@@ -164,7 +164,7 @@ public class DeltaRequest implements Ext
public void execute(DeltaSession session, boolean notifyListeners) {
if ( !this.sessionId.equals( session.getId() ) )
- throw new java.lang.IllegalArgumentException("Session id mismatch,
not executing the delta request");
+ throw new
java.lang.IllegalArgumentException(sm.getString("deltaRequest.ssid.mismatch"));
session.access();
for ( int i=0; i<actions.size(); i++ ) {
AttributeInfo info = actions.get(i);
@@ -210,7 +210,7 @@ public class DeltaRequest implements Ext
}
break;
default :
- throw new java.lang.IllegalArgumentException("Invalid
attribute info type="+info);
+ throw new
java.lang.IllegalArgumentException(sm.getString("deltaRequest.invalidAttributeInfoType",
info));
}//switch
}//for
session.endAccess();
@@ -224,7 +224,7 @@ public class DeltaRequest implements Ext
info.recycle();
actionPool.addLast(info);
}catch ( Exception x ) {
- log.error("Unable to remove element",x);
+ log.error(sm.getString("deltaRequest.removeUnable"),x);
}
}
actions.clear();
@@ -236,7 +236,7 @@ public class DeltaRequest implements Ext
public void setSessionId(String sessionId) {
this.sessionId = sessionId;
if ( sessionId == null ) {
- new Exception("Session Id is null for
setSessionId").fillInStackTrace().printStackTrace();
+ new
Exception(sm.getString("deltaRequest.ssid.null")).fillInStackTrace().printStackTrace();
}
}
public int getSize() {
@@ -268,7 +268,7 @@ public class DeltaRequest implements Ext
try {
info = actionPool.removeFirst();
} catch ( Exception x ) {
- log.error("Unable to remove element",x);
+ log.error(sm.getString("deltaRequest.removeUnable"),x);
info = new AttributeInfo();
}
}
Modified:
tomcat/trunk/java/org/apache/catalina/ha/session/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/LocalStrings.properties?rev=1679936&r1=1679935&r2=1679936&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/session/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/session/LocalStrings.properties
Mon May 18 05:14:16 2015
@@ -55,6 +55,10 @@ deltaManager.waitForSessionState=Manager
deltaManager.unableSerializeSessionID =Unable to serialize sessionID [{0}]
deltaRequest.showPrincipal=Principal [{0}] is set to session {1}
deltaRequest.wrongPrincipalClass=DeltaManager only support GenericPrincipal.
Your realm used principal class {0}.
+deltaRequest.removeUnable=Unable to remove element:
+deltaRequest.ssid.mismatch=Session id mismatch, not executing the delta request
+deltaRequest.invalidAttributeInfoType=Invalid attribute info type={0}
+deltaRequest.ssid.null=Session Id is null for setSessionId
deltaSession.notifying=Notifying cluster of expiration primary={0} sessionId
[{1}]
deltaSession.readSession=readObject() loading session [{0}]
deltaSession.writeSession=writeObject() storing session [{0}]
@@ -83,3 +87,4 @@ backupManager.noCluster=no cluster assoc
backupManager.startUnable=Unable to start BackupManager: [{0}]
backupManager.startFailed=Failed to start BackupManager: [{0}]
backupManager.stopped=Manager [{0}] is stopping
+clusterSessionListener.noManager=Context manager doesn''t exist:{0}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
