Author: kfujino
Date: Tue Mar 22 05:14:35 2016
New Revision: 1736132
URL: http://svn.apache.org/viewvc?rev=1736132&view=rev
Log:
Avoid NPE when a proxy node failed to retrieve a backup entry.
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.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=1736132&r1=1736131&r2=1736132&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 Mar 22 05:14:35 2016
@@ -940,7 +940,7 @@ public abstract class AbstractReplicated
msg = new MapMessage(getMapContextName(),
MapMessage.MSG_RETRIEVE_BACKUP, false,
(Serializable) key, null, null,
null,null);
Response[] resp =
getRpcChannel().send(entry.getBackupNodes(),msg, RpcChannel.FIRST_REPLY,
Channel.SEND_OPTIONS_DEFAULT, getRpcTimeout());
- if (resp == null || resp.length == 0) {
+ if (resp == null || resp.length == 0 ||
resp[0].getMessage() == null) {
//no responses
log.warn("Unable to retrieve remote object for key:" +
key);
return null;
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=1736132&r1=1736131&r2=1736132&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Tue Mar 22 05:14:35 2016
@@ -195,6 +195,9 @@
notify the change of the new primary node to the original backup node.
(kfujino)
</fix>
+ <fix>
+ Avoid NPE when a proxy node failed to retrieve a backup entry.
(kfujino)
+ </fix>
</changelog>
</subsection>
<subsection name="Other">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
