Author: david.lloyd(a)jboss.com Date: 2008-04-14 12:37:01 -0400 (Mon, 14 Apr 2008) New Revision: 3986 Modified: remoting3/trunk/jrpp/src/main/java/org/jboss/cx/remoting/jrpp/JrppConnection.java remoting3/trunk/jrpp/src/main/java/org/jboss/cx/remoting/jrpp/id/JrppContextIdentifier.java remoting3/trunk/jrpp/src/main/java/org/jboss/cx/remoting/jrpp/id/JrppRequestIdentifier.java remoting3/trunk/jrpp/src/main/java/org/jboss/cx/remoting/jrpp/id/JrppServiceIdentifier.java remoting3/trunk/jrpp/src/main/java/org/jboss/cx/remoting/jrpp/id/JrppStreamIdentifier.java remoting3/trunk/jrpp/src/main/java/org/jboss/cx/remoting/jrpp/id/JrppSubChannelIdentifier.java Log: serialVersionUIDs; also an import cleanup, and a buffer size fix Modified: remoting3/trunk/jrpp/src/main/java/org/jboss/cx/remoting/jrpp/JrppConnection.java =================================================================== --- remoting3/trunk/jrpp/src/main/java/org/jboss/cx/remoting/jrpp/JrppConnection.java 2008-04-14 15:45:10 UTC (rev 3985) +++ remoting3/trunk/jrpp/src/main/java/org/jboss/cx/remoting/jrpp/JrppConnection.java 2008-04-14 16:37:01 UTC (rev 3986) @@ -1,9 +1,8 @@ package org.jboss.cx.remoting.jrpp; -import static java.lang.Math.*; - import java.io.IOException; import java.io.ObjectOutput; +import static java.lang.Math.min; import java.util.Enumeration; import java.util.HashMap; import java.util.HashSet; @@ -12,20 +11,6 @@ import java.util.Set; import java.util.concurrent.Executor; import java.util.concurrent.atomic.AtomicInteger; - -import javax.security.auth.callback.Callback; -import javax.security.auth.callback.CallbackHandler; -import javax.security.auth.callback.NameCallback; -import javax.security.auth.callback.PasswordCallback; -import javax.security.auth.callback.UnsupportedCallbackException; -import javax.security.sasl.AuthorizeCallback; -import javax.security.sasl.RealmCallback; -import javax.security.sasl.Sasl; -import javax.security.sasl.SaslClient; -import javax.security.sasl.SaslException; -import javax.security.sasl.SaslServer; -import javax.security.sasl.SaslServerFactory; - import org.apache.mina.common.AttributeKey; import org.apache.mina.common.IdleStatus; import org.apache.mina.common.IoBuffer; @@ -55,6 +40,19 @@ import org.jboss.cx.remoting.util.CollectionUtil; import org.jboss.cx.remoting.util.WeakHashSet; +import javax.security.auth.callback.Callback; +import javax.security.auth.callback.CallbackHandler; +import javax.security.auth.callback.NameCallback; +import javax.security.auth.callback.PasswordCallback; +import javax.security.auth.callback.UnsupportedCallbackException; +import javax.security.sasl.AuthorizeCallback; +import javax.security.sasl.RealmCallback; +import javax.security.sasl.Sasl; +import javax.security.sasl.SaslClient; +import javax.security.sasl.SaslException; +import javax.security.sasl.SaslServer; +import javax.security.sasl.SaslServerFactory; + /** * */ @@ -514,7 +512,7 @@ if (! state.in(State.UP)) { return; } - final IoBuffer buffer = newBuffer(60, false); + final IoBuffer buffer = newBuffer(300, false); final ObjectMessageOutput output = protocolContext.getMessageOutput(new IoBufferByteMessageOutput(buffer, ioSession)); write(output, MessageType.CLOSE_CONTEXT); write(output, contextIdentifier); Modified: remoting3/trunk/jrpp/src/main/java/org/jboss/cx/remoting/jrpp/id/JrppContextIdentifier.java =================================================================== --- remoting3/trunk/jrpp/src/main/java/org/jboss/cx/remoting/jrpp/id/JrppContextIdentifier.java 2008-04-14 15:45:10 UTC (rev 3985) +++ remoting3/trunk/jrpp/src/main/java/org/jboss/cx/remoting/jrpp/id/JrppContextIdentifier.java 2008-04-14 16:37:01 UTC (rev 3986) @@ -7,6 +7,9 @@ */ @SuppressWarnings ({"EqualsAndHashcode"}) public final class JrppContextIdentifier extends JrppSubChannelIdentifier implements ContextIdentifier { + + private static final long serialVersionUID = 1L; + public JrppContextIdentifier() { } Modified: remoting3/trunk/jrpp/src/main/java/org/jboss/cx/remoting/jrpp/id/JrppRequestIdentifier.java =================================================================== --- remoting3/trunk/jrpp/src/main/java/org/jboss/cx/remoting/jrpp/id/JrppRequestIdentifier.java 2008-04-14 15:45:10 UTC (rev 3985) +++ remoting3/trunk/jrpp/src/main/java/org/jboss/cx/remoting/jrpp/id/JrppRequestIdentifier.java 2008-04-14 16:37:01 UTC (rev 3986) @@ -7,6 +7,9 @@ */ @SuppressWarnings ({"EqualsAndHashcode"}) public final class JrppRequestIdentifier extends JrppSubChannelIdentifier implements RequestIdentifier { + + private static final long serialVersionUID = 1L; + public JrppRequestIdentifier() { } Modified: remoting3/trunk/jrpp/src/main/java/org/jboss/cx/remoting/jrpp/id/JrppServiceIdentifier.java =================================================================== --- remoting3/trunk/jrpp/src/main/java/org/jboss/cx/remoting/jrpp/id/JrppServiceIdentifier.java 2008-04-14 15:45:10 UTC (rev 3985) +++ remoting3/trunk/jrpp/src/main/java/org/jboss/cx/remoting/jrpp/id/JrppServiceIdentifier.java 2008-04-14 16:37:01 UTC (rev 3986) @@ -7,6 +7,9 @@ */ @SuppressWarnings ({"EqualsAndHashcode"}) public final class JrppServiceIdentifier extends JrppSubChannelIdentifier implements ServiceIdentifier { + + private static final long serialVersionUID = 1L; + public JrppServiceIdentifier() { } Modified: remoting3/trunk/jrpp/src/main/java/org/jboss/cx/remoting/jrpp/id/JrppStreamIdentifier.java =================================================================== --- remoting3/trunk/jrpp/src/main/java/org/jboss/cx/remoting/jrpp/id/JrppStreamIdentifier.java 2008-04-14 15:45:10 UTC (rev 3985) +++ remoting3/trunk/jrpp/src/main/java/org/jboss/cx/remoting/jrpp/id/JrppStreamIdentifier.java 2008-04-14 16:37:01 UTC (rev 3986) @@ -7,6 +7,9 @@ */ @SuppressWarnings ({"EqualsAndHashcode"}) public final class JrppStreamIdentifier extends JrppSubChannelIdentifier implements StreamIdentifier { + + private static final long serialVersionUID = 1L; + public JrppStreamIdentifier() { } Modified: remoting3/trunk/jrpp/src/main/java/org/jboss/cx/remoting/jrpp/id/JrppSubChannelIdentifier.java =================================================================== --- remoting3/trunk/jrpp/src/main/java/org/jboss/cx/remoting/jrpp/id/JrppSubChannelIdentifier.java 2008-04-14 15:45:10 UTC (rev 3985) +++ remoting3/trunk/jrpp/src/main/java/org/jboss/cx/remoting/jrpp/id/JrppSubChannelIdentifier.java 2008-04-14 16:37:01 UTC (rev 3986) @@ -9,6 +9,9 @@ * */ public abstract class JrppSubChannelIdentifier implements Externalizable { + + private static final long serialVersionUID = 1L; + private /*final*/ boolean client; private /*final*/ int id;