hammant 2002/10/20 12:19:51
Modified: altrmi/src/java/org/apache/excalibur/altrmi/client/impl
AbstractAltrmiFactory.java
ClientClassAltrmiFactory.java
altrmi/src/java/org/apache/excalibur/altrmi/client/impl/socket
SocketCustomStreamFactoryHelper.java
altrmi/src/java/org/apache/excalibur/altrmi/registry
Registry.java
altrmi/src/java/org/apache/excalibur/altrmi/server/impl
DefaultMethodInvocationHandler.java
altrmi/src/java/org/apache/excalibur/altrmi/server/impl/adapters
InvocationHandlerAdapter.java
Log:
small bug fix on redirect + checkstyle work
Revision Changes Path
1.11 +3 -2
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/AbstractAltrmiFactory.java
Index: AbstractAltrmiFactory.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/AbstractAltrmiFactory.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- AbstractAltrmiFactory.java 13 Oct 2002 13:40:00 -0000 1.10
+++ AbstractAltrmiFactory.java 20 Oct 2002 19:19:51 -0000 1.11
@@ -125,7 +125,8 @@
// Registry not found, or a different instance to the one
// the server placed its piped instance in.
// revert to non optimized.
- m_clientInvocationHandler.handleInvocation(new
OpenConnectionRequest( null ) );
+ reply = m_clientInvocationHandler.handleInvocation(
+ new OpenConnectionRequest( null ) );
}
else
{
1.9 +8 -2
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/ClientClassAltrmiFactory.java
Index: ClientClassAltrmiFactory.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/ClientClassAltrmiFactory.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ClientClassAltrmiFactory.java 13 Oct 2002 11:54:25 -0000 1.8
+++ ClientClassAltrmiFactory.java 20 Oct 2002 19:19:51 -0000 1.9
@@ -45,7 +45,13 @@
code = "";
}
- return this.getClass().getClassLoader().loadClass( "AltrmiGenerated"
+ code + publishedServiceName + "_" + objectName );
+ String className = "AltrmiGenerated" + code + publishedServiceName +
"_" + objectName;
+
+ try {
+ return
Thread.currentThread().getContextClassLoader().loadClass(className);
+ } catch (ClassNotFoundException e) {
+ return this.getClass().getClassLoader().loadClass(className);
+ }
}
/**
1.4 +2 -1
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/socket/SocketCustomStreamFactoryHelper.java
Index: SocketCustomStreamFactoryHelper.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/socket/SocketCustomStreamFactoryHelper.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SocketCustomStreamFactoryHelper.java 13 Oct 2002 11:54:26 -0000
1.3
+++ SocketCustomStreamFactoryHelper.java 20 Oct 2002 19:19:51 -0000
1.4
@@ -55,6 +55,7 @@
}
catch( IOException e )
{
+ e.printStackTrace();
throw new AltrmiConnectionException( "IO Exception during
connection: "
+ e.getMessage() );
}
1.3 +7 -5
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/registry/Registry.java
Index: Registry.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/registry/Registry.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Registry.java 13 Oct 2002 13:40:00 -0000 1.2
+++ Registry.java 20 Oct 2002 19:19:51 -0000 1.3
@@ -16,7 +16,7 @@
public class Registry
{
- private static HashMap m_map = new HashMap();
+ private static HashMap c_map = new HashMap();
/**
* Get a Bound object.
@@ -25,8 +25,9 @@
*/
public Binder get(String key)
{
- synchronized (m_map) {
- return (Binder) m_map.get(key);
+ synchronized (c_map)
+ {
+ return (Binder) c_map.get(key);
}
}
@@ -37,8 +38,9 @@
*/
public void put (String key, Object object)
{
- synchronized (m_map) {
- m_map.put(key, object);
+ synchronized (c_map)
+ {
+ c_map.put(key, object);
}
}
1.8 +3 -3
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/server/impl/DefaultMethodInvocationHandler.java
Index: DefaultMethodInvocationHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/server/impl/DefaultMethodInvocationHandler.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- DefaultMethodInvocationHandler.java 21 Sep 2002 15:52:56 -0000
1.7
+++ DefaultMethodInvocationHandler.java 20 Oct 2002 19:19:51 -0000
1.8
@@ -53,7 +53,7 @@
/**
* Next reference
*/
- private static int NEXT_REFERENCE = 1;
+ private static int c_nextReference = 1;
/**
* The altrmi publisher
@@ -169,7 +169,7 @@
//ref = new Long((long) ((long) mNextReference++ << 32)
// + (long) Math.round(Math.random()));
- ref = new Long( NEXT_REFERENCE++ );
+ ref = new Long( c_nextReference++ );
//m_beanRefs.put(implBean, ref);
//m_refBeans.put(ref, implBean);
1.10 +3 -3
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/server/impl/adapters/InvocationHandlerAdapter.java
Index: InvocationHandlerAdapter.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/server/impl/adapters/InvocationHandlerAdapter.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- InvocationHandlerAdapter.java 13 Oct 2002 11:54:26 -0000 1.9
+++ InvocationHandlerAdapter.java 20 Oct 2002 19:19:51 -0000 1.10
@@ -60,7 +60,7 @@
implements AltrmiInvocationHandler
{
- private static int SESSION = 0;
+ private static int c_session = 0;
private static final UID U_ID = new UID((short)20729);
private Long m_lastSession = new Long( 0 );
private HashMap m_sessions = new HashMap();
@@ -502,7 +502,7 @@
{
// approve everything and set session identifier.
- return new Long( (long)( (long)SESSION++ << 32 ) + (long)Math.round(
Math.random() ) );
+ return new Long( (long)( (long)c_session++ << 32 ) +
(long)Math.round( Math.random() ) );
}
/**
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
