Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: belaban/JGroups
base: 0a2d2ca
...
head fork: belaban/JGroups
compare: 983a252
Checking mergeability… Don't worry, you can still create the pull request.
  • 2 commits
  • 5 files changed
  • 0 commit comments
  • 1 contributor
View
2  build.xml
@@ -6,7 +6,7 @@
build.xml file for JGroups. Needs Ant (jakarta.apache.org) to run
</description>
- <property name="version" value="2.12.2.Final"/>
+ <property name="version" value="2.12.3.Final"/>
<property name="build.properties.file" value="build.properties"/>
<property file="${build.properties.file}"/>
<property name="root.dir" value="${basedir}"/>
View
2  conf/manifest.mf
@@ -1,4 +1,4 @@
Manifest-Version: 1.0
Created-By: Apache Ant 1.6.5
Main-Class: org.jgroups.Version
-Implementation-Version: 2.12.2.Final
+Implementation-Version: 2.12.3.Final
View
2  pom.xml
@@ -5,7 +5,7 @@
<artifactId>jgroups</artifactId>
<packaging>bundle</packaging>
<name>JGroups</name>
- <version>2.12.2.Final</version>
+ <version>2.12.3.Final</version>
<url>http://www.jgroups.org</url>
<description>
Reliable cluster communication toolkit
View
4 src/org/jgroups/Version.java
@@ -21,8 +21,8 @@
public class Version {
public static final short major = 2;
public static final short minor = 12;
- public static final short micro = 2;
- public static final String description="2.12.2.Final";
+ public static final short micro = 3;
+ public static final String description="2.12.3.Final";
public static final short version=encode(major, minor, micro);
public static final String string_version=print(version);
View
33 src/org/jgroups/protocols/AUTH.java
@@ -27,9 +27,9 @@
/**
* used on the coordinator to authentication joining member requests against
*/
- private AuthToken auth_plugin=null;
+ protected AuthToken auth_token =null;
- private static final short gms_id=ClassConfigurator.getProtocolId(GMS.class);
+ protected static final short gms_id=ClassConfigurator.getProtocolId(GMS.class);
public AUTH() {
@@ -41,26 +41,29 @@ public AUTH() {
@Property(name="auth_class")
public void setAuthClass(String class_name) throws Exception {
Object obj=Class.forName(class_name).newInstance();
- auth_plugin=(AuthToken)obj;
- auth_plugin.setAuth(this);
+ auth_token =(AuthToken)obj;
+ auth_token.setAuth(this);
}
- public String getAuthClass() {return auth_plugin != null? auth_plugin.getClass().getName() : null;}
+ public String getAuthClass() {return auth_token != null? auth_token.getClass().getName() : null;}
+
+ public AuthToken getAuthToken() {return auth_token;}
+ public void setAuthToken(AuthToken token) {this.auth_token=token;}
protected List<Object> getConfigurableObjects() {
List<Object> retval=new LinkedList<Object>();
- if(auth_plugin != null)
- retval.add(auth_plugin);
+ if(auth_token != null)
+ retval.add(auth_token);
return retval;
}
public void init() throws Exception {
super.init();
- if(auth_plugin instanceof X509Token) {
- X509Token tmp=(X509Token)auth_plugin;
+ if(auth_token instanceof X509Token) {
+ X509Token tmp=(X509Token) auth_token;
tmp.setCertificate();
}
- auth_plugin.init();
+ auth_token.init();
}
@@ -87,7 +90,7 @@ public Object up(Event evt) {
if(authHeader != null) {
//Now we have the AUTH Header we need to validate it
- if(this.auth_plugin.authenticate(authHeader.getToken(), msg)) {
+ if(this.auth_token.authenticate(authHeader.getToken(), msg)) {
return up_prot.up(evt);
}
else {
@@ -122,7 +125,7 @@ protected void sendRejectionMessage(byte type, Address dest, String error_msg) {
sendJoinRejectionMessage(dest, error_msg);
break;
case GMS.GmsHeader.MERGE_REQ:
- sendMergeRejectionMessage(dest, error_msg);
+ sendMergeRejectionMessage(dest);
break;
default:
log.error("type " + type + " unknown");
@@ -142,7 +145,7 @@ protected void sendJoinRejectionMessage(Address dest, String error_msg) {
down_prot.down(new Event(Event.MSG, msg));
}
- protected void sendMergeRejectionMessage(Address dest, String error_msg) {
+ protected void sendMergeRejectionMessage(Address dest) {
Message msg=new Message(dest, null, null);
msg.setFlag(Message.OOB);
GMS.GmsHeader hdr=new GMS.GmsHeader(GMS.GmsHeader.MERGE_RSP);
@@ -168,7 +171,7 @@ public Object down(Event evt) {
//we found a join request message - now add an AUTH Header
Message msg = (Message)evt.getArg();
AuthHeader authHeader = new AuthHeader();
- authHeader.setToken(this.auth_plugin);
+ authHeader.setToken(this.auth_token);
msg.putHeader(this.id, authHeader);
}
return down_prot.down(evt);
@@ -179,7 +182,7 @@ public Object down(Event evt) {
* @param evt The event object passed in to AUTH
* @return A GmsHeader object or null if the event contains a message of a different type
*/
- private static GMS.GmsHeader getGMSHeader(Event evt){
+ protected static GMS.GmsHeader getGMSHeader(Event evt){
Message msg;
switch(evt.getType()){
case Event.MSG:

No commit comments for this range

Something went wrong with that request. Please try again.