Author: remm
Date: Thu Jul 27 15:15:52 2017
New Revision: 1803193
URL: http://svn.apache.org/viewvc?rev=1803193&view=rev
Log:
Fix some clone usage issues.
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/ChannelMessage.java
tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
tomcat/trunk/java/org/apache/catalina/tribes/tipis/LocalStrings.properties
tomcat/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java
tomcat/trunk/java/org/apache/tomcat/util/buf/CharChunk.java
tomcat/trunk/java/org/apache/tomcat/util/buf/MessageBytes.java
Modified: tomcat/trunk/java/org/apache/catalina/tribes/ChannelMessage.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/ChannelMessage.java?rev=1803193&r1=1803192&r2=1803193&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/ChannelMessage.java (original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/ChannelMessage.java Thu Jul 27
15:15:52 2017
@@ -26,7 +26,7 @@ import org.apache.catalina.tribes.io.XBy
* interceptor and eventually down to the ChannelSender component
*
*/
-public interface ChannelMessage extends Serializable {
+public interface ChannelMessage extends Serializable, Cloneable {
/**
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java?rev=1803193&r1=1803192&r2=1803193&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
Thu Jul 27 15:15:52 2017
@@ -1133,11 +1133,6 @@ public abstract class AbstractReplicated
return false;
}
- @Override
- public Object clone() {
- throw new
UnsupportedOperationException(sm.getString("abstractReplicatedMap.unsupport.operation"));
- }
-
/**
* Returns the entire contents of the map
* Map.Entry.getValue() will return a LazyReplicatedMap.MapEntry object
containing all the information
@@ -1376,7 +1371,7 @@ public abstract class AbstractReplicated
// map message to send to and from other maps
//------------------------------------------------------------------------------
- public static class MapMessage implements Serializable {
+ public static class MapMessage implements Serializable, Cloneable {
private static final long serialVersionUID = 1L;
public static final int MSG_BACKUP = 1;
public static final int MSG_RETRIEVE_BACKUP = 2;
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/tipis/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/tipis/LocalStrings.properties?rev=1803193&r1=1803192&r2=1803193&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/tipis/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/tipis/LocalStrings.properties
Thu Jul 27 15:15:52 2017
@@ -33,7 +33,6 @@ abstractReplicatedMap.unable.remove=Unab
abstractReplicatedMap.unable.retrieve=Unable to retrieve remote object for
key:[{0}]
abstractReplicatedMap.unable.get=Unable to replicate out data for a
AbstractReplicatedMap.get operation
abstractReplicatedMap.unable.put=Unable to replicate out data for a
AbstractReplicatedMap.put operation
-abstractReplicatedMap.unsupport.operation=This operation is not valid on a
replicated map
abstractReplicatedMap.mapMemberAdded.nullMember=Notified member is not
registered in the membership:[{0}].
abstractReplicatedMap.mapMemberAdded.added=Map member added:[{0}]
abstractReplicatedMap.leftOver.pingMsg=PING message has been received beyond
the timeout period. The map member[{0}] might have been removed from the map
membership.
Modified: tomcat/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java?rev=1803193&r1=1803192&r2=1803193&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java Thu Jul 27
15:15:52 2017
@@ -148,6 +148,11 @@ public final class ByteChunk implements
allocate( initial, -1 );
}
+ @Override
+ public Object clone() throws CloneNotSupportedException {
+ return super.clone();
+ }
+
public boolean isNull() {
return ! isSet; // buff==null;
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/buf/CharChunk.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/buf/CharChunk.java?rev=1803193&r1=1803192&r2=1803193&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/buf/CharChunk.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/buf/CharChunk.java Thu Jul 27
15:15:52 2017
@@ -98,6 +98,11 @@ public final class CharChunk implements
// --------------------
+ @Override
+ public Object clone() throws CloneNotSupportedException {
+ return super.clone();
+ }
+
public boolean isNull() {
if( end > 0 ) {
return false;
Modified: tomcat/trunk/java/org/apache/tomcat/util/buf/MessageBytes.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/buf/MessageBytes.java?rev=1803193&r1=1803192&r2=1803193&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/buf/MessageBytes.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/buf/MessageBytes.java Thu Jul 27
15:15:52 2017
@@ -81,6 +81,11 @@ public final class MessageBytes implemen
return factory.newInstance();
}
+ @Override
+ public Object clone() throws CloneNotSupportedException {
+ return super.clone();
+ }
+
public boolean isNull() {
return byteC.isNull() && charC.isNull() && ! hasStrValue;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
