Author: markt
Date: Fri Dec 19 14:34:53 2014
New Revision: 1646733
URL: http://svn.apache.org/r1646733
Log:
No longer need SerializablePrincipal in Cluster code since GenericPrincipal now
implements Serializable
Removed:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/session/SerializablePrincipal.java
tomcat/tc8.0.x/trunk/test/org/apache/catalina/ha/
Modified:
tomcat/tc8.0.x/trunk/ (props changed)
tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/authenticator/ClusterSingleSignOn.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/authenticator/ClusterSingleSignOnListener.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/authenticator/SingleSignOnMessage.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/session/DeltaRequest.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/session/DeltaSession.java
Propchange: tomcat/tc8.0.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec 19 14:34:53 2014
@@ -1 +1 @@
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892
,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1646302,1646304,1646420
+/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892
,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1646302,1646304,1646420
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/authenticator/ClusterSingleSignOn.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/authenticator/ClusterSingleSignOn.java?rev=1646733&r1=1646732&r2=1646733&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/authenticator/ClusterSingleSignOn.java
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/authenticator/ClusterSingleSignOn.java
Fri Dec 19 14:34:53 2014
@@ -30,7 +30,6 @@ import org.apache.catalina.authenticator
import org.apache.catalina.ha.CatalinaCluster;
import org.apache.catalina.ha.ClusterManager;
import org.apache.catalina.ha.ClusterValve;
-import org.apache.catalina.ha.session.SerializablePrincipal;
import org.apache.catalina.realm.GenericPrincipal;
import org.apache.tomcat.util.ExceptionUtils;
@@ -281,10 +280,8 @@ public class ClusterSingleSignOn extends
msg.setUsername(username);
msg.setPassword(password);
- SerializablePrincipal sp = null;
if (principal instanceof GenericPrincipal) {
- sp = SerializablePrincipal.createPrincipal((GenericPrincipal)
principal);
- msg.setPrincipal(sp);
+ msg.setPrincipal((GenericPrincipal) principal);
}
cluster.send(msg);
@@ -346,10 +343,8 @@ public class ClusterSingleSignOn extends
msg.setUsername(username);
msg.setPassword(password);
- SerializablePrincipal sp = null;
if (principal instanceof GenericPrincipal) {
- sp = SerializablePrincipal.createPrincipal((GenericPrincipal)
principal);
- msg.setPrincipal(sp);
+ msg.setPrincipal((GenericPrincipal) principal);
}
cluster.send(msg);
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/authenticator/ClusterSingleSignOnListener.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/authenticator/ClusterSingleSignOnListener.java?rev=1646733&r1=1646732&r2=1646733&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/authenticator/ClusterSingleSignOnListener.java
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/authenticator/ClusterSingleSignOnListener.java
Fri Dec 19 14:34:53 2014
@@ -86,14 +86,14 @@ public class ClusterSingleSignOnListener
break;
case SingleSignOnMessage.REGISTER_SESSION:
if (msg.getPrincipal() != null) {
- principal = msg.getPrincipal().getPrincipal();
+ principal = msg.getPrincipal();
}
clusterSSO.registerLocal(msg.getSsoId(), principal,
msg.getAuthType(),
msg.getUsername(), msg.getPassword());
break;
case SingleSignOnMessage.UPDATE_SESSION:
if (msg.getPrincipal() != null) {
- principal = msg.getPrincipal().getPrincipal();
+ principal = msg.getPrincipal();
}
clusterSSO.updateLocal(msg.getSsoId(), principal,
msg.getAuthType(),
msg.getUsername(), msg.getPassword());
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/authenticator/SingleSignOnMessage.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/authenticator/SingleSignOnMessage.java?rev=1646733&r1=1646732&r2=1646733&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/authenticator/SingleSignOnMessage.java
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/authenticator/SingleSignOnMessage.java
Fri Dec 19 14:34:53 2014
@@ -18,7 +18,7 @@
package org.apache.catalina.ha.authenticator;
import org.apache.catalina.ha.ClusterMessage;
-import org.apache.catalina.ha.session.SerializablePrincipal;
+import org.apache.catalina.realm.GenericPrincipal;
import org.apache.catalina.tribes.Member;
/**
@@ -45,7 +45,7 @@ public class SingleSignOnMessage impleme
private String authType = null;
private String password = null;
private String username = null;
- private SerializablePrincipal principal = null;
+ private GenericPrincipal principal = null;
private Member address = null;
private long timestamp = 0;
@@ -165,11 +165,11 @@ public class SingleSignOnMessage impleme
this.username = username;
}
- public SerializablePrincipal getPrincipal() {
+ public GenericPrincipal getPrincipal() {
return principal;
}
- public void setPrincipal(SerializablePrincipal principal) {
+ public void setPrincipal(GenericPrincipal principal) {
this.principal = principal;
}
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/session/DeltaRequest.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/session/DeltaRequest.java?rev=1646733&r1=1646732&r2=1646733&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/session/DeltaRequest.java
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/session/DeltaRequest.java
Fri Dec 19 14:34:53 2014
@@ -100,16 +100,16 @@ public class DeltaRequest implements Ext
*/
public void setPrincipal(Principal p) {
int action = (p==null)?ACTION_REMOVE:ACTION_SET;
- SerializablePrincipal sp = null;
- if ( p != null ) {
- if(p instanceof GenericPrincipal) {
- sp =
SerializablePrincipal.createPrincipal((GenericPrincipal)p);
+ GenericPrincipal gp = null;
+ if (p != null) {
+ if (p instanceof GenericPrincipal) {
+ gp = (GenericPrincipal) p;
if(log.isDebugEnabled())
log.debug(sm.getString("deltaRequest.showPrincipal",
p.getName() , getSessionId()));
} else
log.error(sm.getString("deltaRequest.wrongPrincipalClass",p.getClass().getName()));
}
- addAction(TYPE_PRINCIPAL,action,NAME_PRINCIPAL,sp);
+ addAction(TYPE_PRINCIPAL, action, NAME_PRINCIPAL, gp);
}
public void setNew(boolean n) {
@@ -178,9 +178,8 @@ public class DeltaRequest implements Ext
break;
case TYPE_PRINCIPAL:
Principal p = null;
- if ( info.getAction() == ACTION_SET ) {
- SerializablePrincipal sp =
(SerializablePrincipal)info.getValue();
- p = sp.getPrincipal();
+ if (info.getAction() == ACTION_SET) {
+ p = (Principal) info.getValue();
}
session.setPrincipal(p,false);
break;
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/session/DeltaSession.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/session/DeltaSession.java?rev=1646733&r1=1646732&r2=1646733&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/session/DeltaSession.java
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/session/DeltaSession.java
Fri Dec 19 14:34:53 2014
@@ -38,7 +38,6 @@ import org.apache.catalina.ha.CatalinaCl
import org.apache.catalina.ha.ClusterManager;
import org.apache.catalina.ha.ClusterMessage;
import org.apache.catalina.ha.ClusterSession;
-import org.apache.catalina.realm.GenericPrincipal;
import org.apache.catalina.session.ManagerBase;
import org.apache.catalina.session.StandardSession;
import org.apache.catalina.tribes.io.ReplicationStream;
@@ -721,7 +720,7 @@ public class DeltaSession extends Standa
boolean hasPrincipal = stream.readBoolean();
principal = null;
if (hasPrincipal) {
- principal = SerializablePrincipal.readPrincipal(stream);
+ principal = (Principal) stream.readObject();
}
// setId((String) stream.readObject());
@@ -799,9 +798,9 @@ public class DeltaSession extends Standa
stream.writeObject(Boolean.valueOf(isValid));
stream.writeObject(Long.valueOf(thisAccessedTime));
stream.writeObject(Long.valueOf(version));
- stream.writeBoolean(getPrincipal() != null);
- if (getPrincipal() != null) {
- SerializablePrincipal.writePrincipal((GenericPrincipal)
principal,stream);
+ stream.writeBoolean(getPrincipal() instanceof Serializable);
+ if (getPrincipal() instanceof Serializable) {
+ stream.writeObject(getPrincipal());
}
stream.writeObject(id);
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
