Author: kfujino
Date: Tue Oct 22 09:45:25 2013
New Revision: 1534575
URL: http://svn.apache.org/r1534575
Log:
The logger of AbstractReplicatedMap should be non-static in order to enable
logging of each application.
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/tipis/LazyReplicatedMap.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java?rev=1534575&r1=1534574&r2=1534575&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
Tue Oct 22 09:45:25 2013
@@ -57,7 +57,7 @@ import org.apache.juli.logging.LogFactor
public abstract class AbstractReplicatedMap extends ConcurrentHashMap
implements RpcCallback, ChannelListener, MembershipListener, Heartbeat {
private static final long serialVersionUID = 1L;
- private static final Log log =
LogFactory.getLog(AbstractReplicatedMap.class);
+ private final Log log = LogFactory.getLog(AbstractReplicatedMap.class);
/**
* The default initial capacity - MUST be a power of two.
@@ -1396,8 +1396,7 @@ public abstract class AbstractReplicated
try {
return key(null);
} catch ( Exception x ) {
- log.error("Deserialization error of the MapMessage.key",x);
- return null;
+ throw new RuntimeException("Deserialization error of the
MapMessage.key", x);
}
}
@@ -1417,8 +1416,7 @@ public abstract class AbstractReplicated
try {
return value(null);
} catch ( Exception x ) {
- log.error("Deserialization error of the MapMessage.value",x);
- return null;
+ throw new RuntimeException("Deserialization error of the
MapMessage.value", x);
}
}
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/tipis/LazyReplicatedMap.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/tipis/LazyReplicatedMap.java?rev=1534575&r1=1534574&r2=1534575&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/tipis/LazyReplicatedMap.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/tipis/LazyReplicatedMap.java
Tue Oct 22 09:45:25 2013
@@ -65,7 +65,7 @@ import org.apache.juli.logging.LogFactor
*/
public class LazyReplicatedMap extends AbstractReplicatedMap {
private static final long serialVersionUID = 1L;
- private static final Log log = LogFactory.getLog(LazyReplicatedMap.class);
+ private final Log log = LogFactory.getLog(LazyReplicatedMap.class);
//------------------------------------------------------------------------------
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1534575&r1=1534574&r2=1534575&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Tue Oct 22 09:45:25 2013
@@ -86,6 +86,10 @@
Add log message that initialization of
<code>AbstractReplicatedMap</code> has been completed. (kfujino)
</add>
+ <fix>
+ The logger of <code>AbstractReplicatedMap</code> should be non-static
in
+ order to enable logging of each application. (kfujino)
+ </fix>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
