Author: kfujino
Date: Wed Apr 18 02:06:51 2012
New Revision: 1327357
URL: http://svn.apache.org/viewvc?rev=1327357&view=rev
Log:
fix typo.
objectMadePrimay was change to objectMadePrimary.
Modified:
tomcat/trunk/java/org/apache/catalina/ha/context/ReplicatedContext.java
tomcat/trunk/java/org/apache/catalina/ha/session/BackupManager.java
tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
Modified:
tomcat/trunk/java/org/apache/catalina/ha/context/ReplicatedContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/context/ReplicatedContext.java?rev=1327357&r1=1327356&r2=1327357&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/context/ReplicatedContext.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/context/ReplicatedContext.java Wed
Apr 18 02:06:51 2012
@@ -211,7 +211,7 @@ public class ReplicatedContext extends S
}
@Override
- public void objectMadePrimay(Object key, Object value) {
+ public void objectMadePrimary(Object key, Object value) {
//noop
}
Modified: tomcat/trunk/java/org/apache/catalina/ha/session/BackupManager.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/BackupManager.java?rev=1327357&r1=1327356&r2=1327357&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/session/BackupManager.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/session/BackupManager.java Wed Apr
18 02:06:51 2012
@@ -111,7 +111,7 @@ public class BackupManager extends Clust
// OVERRIDE THESE METHODS TO IMPLEMENT THE REPLICATION
//=========================================================================
@Override
- public void objectMadePrimay(Object key, Object value) {
+ public void objectMadePrimary(Object key, Object value) {
if (value!=null && value instanceof DeltaSession) {
DeltaSession session = (DeltaSession)value;
synchronized (session) {
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=1327357&r1=1327356&r2=1327357&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
Wed Apr 18 02:06:51 2012
@@ -152,8 +152,7 @@ public abstract class AbstractReplicated
//------------------------------------------------------------------------------
public static interface MapOwner {
- // a typo, should have been "objectMadePrimary"
- public void objectMadePrimay(Object key, Object value);
+ public void objectMadePrimary(Object key, Object value);
}
//------------------------------------------------------------------------------
@@ -817,7 +816,7 @@ public abstract class AbstractReplicated
entry.setProxy(false);
Member[] backup = publishEntryInfo(entry.getKey(),
entry.getValue());
entry.setBackupNodes(backup);
- if ( mapOwner!=null )
mapOwner.objectMadePrimay(entry.getKey(),entry.getValue());
+ if ( mapOwner!=null )
mapOwner.objectMadePrimary(entry.getKey(),entry.getValue());
} catch (ChannelException x) {
log.error("Unable to relocate[" + entry.getKey() + "] to a
new backup node", x);
@@ -937,7 +936,7 @@ public abstract class AbstractReplicated
entry.setBackupNodes(backup);
entry.setBackup(false);
entry.setProxy(false);
- if ( getMapOwner()!=null ) getMapOwner().objectMadePrimay(key,
entry.getValue());
+ if ( getMapOwner()!=null )
getMapOwner().objectMadePrimary(key, entry.getValue());
} catch (Exception x) {
log.error("Unable to replicate out data for a
LazyReplicatedMap.get operation", x);
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
