[jboss-remoting-commits] JBoss Remoting SVN: r4465 - in remoting3/trunk/protocol/basic/src: test/java/org/jboss/cx/remoting/protocol/basic and 1 other directory.

[jboss-remoting-commits at lists.jboss.org]

Author: david.lloyd at jboss.com
Date: 2008-08-04 23:03:07 -0400 (Mon, 04 Aug 2008)
New Revision: 4465

Modified:
   remoting3/trunk/protocol/basic/src/main/java/org/jboss/cx/remoting/protocol/basic/BasicProtocol.java
   remoting3/trunk/protocol/basic/src/main/java/org/jboss/cx/remoting/protocol/basic/Connection.java
   remoting3/trunk/protocol/basic/src/main/java/org/jboss/cx/remoting/protocol/basic/ServiceRegistry.java
   remoting3/trunk/protocol/basic/src/main/java/org/jboss/cx/remoting/protocol/basic/ServiceRegistryImpl.java
   remoting3/trunk/protocol/basic/src/test/java/org/jboss/cx/remoting/protocol/basic/ConnectionTestCase.java
Log:
More compile fixes

Modified: remoting3/trunk/protocol/basic/src/main/java/org/jboss/cx/remoting/protocol/basic/BasicProtocol.java
===================================================================
--- remoting3/trunk/protocol/basic/src/main/java/org/jboss/cx/remoting/protocol/basic/BasicProtocol.java	2008-08-05 03:01:12 UTC (rev 4464)
+++ remoting3/trunk/protocol/basic/src/main/java/org/jboss/cx/remoting/protocol/basic/BasicProtocol.java	2008-08-05 03:03:07 UTC (rev 4465)
@@ -79,7 +79,7 @@
         return new AbstractConvertingIoFuture<Connection, AllocatedMessageChannel>(futureChannel) {
             protected Connection convert(final AllocatedMessageChannel channel) throws RemotingException {
                 return new AbstractConnection(executor) {
-                    public Handle<RequestHandlerSource> getServiceForId(final int id) throws RemotingException {
+                    public Handle<RequestHandlerSource> getServiceForId(final int id) throws IOException {
                         return basicHandler.getRemoteService(id).getHandle();
                     }
                 };

Modified: remoting3/trunk/protocol/basic/src/main/java/org/jboss/cx/remoting/protocol/basic/Connection.java
===================================================================
--- remoting3/trunk/protocol/basic/src/main/java/org/jboss/cx/remoting/protocol/basic/Connection.java	2008-08-05 03:01:12 UTC (rev 4464)
+++ remoting3/trunk/protocol/basic/src/main/java/org/jboss/cx/remoting/protocol/basic/Connection.java	2008-08-05 03:03:07 UTC (rev 4465)
@@ -26,10 +26,11 @@
 import org.jboss.cx.remoting.spi.remote.Handle;
 import org.jboss.cx.remoting.HandleableCloseable;
 import org.jboss.cx.remoting.RemotingException;
+import java.io.IOException;
 
 /**
  *
  */
 public interface Connection extends HandleableCloseable<Connection> {
-    Handle<RequestHandlerSource> getServiceForId(int id) throws RemotingException;
+    Handle<RequestHandlerSource> getServiceForId(int id) throws IOException;
 }

Modified: remoting3/trunk/protocol/basic/src/main/java/org/jboss/cx/remoting/protocol/basic/ServiceRegistry.java
===================================================================
--- remoting3/trunk/protocol/basic/src/main/java/org/jboss/cx/remoting/protocol/basic/ServiceRegistry.java	2008-08-05 03:01:12 UTC (rev 4464)
+++ remoting3/trunk/protocol/basic/src/main/java/org/jboss/cx/remoting/protocol/basic/ServiceRegistry.java	2008-08-05 03:03:07 UTC (rev 4465)
@@ -25,18 +25,19 @@
 import org.jboss.cx.remoting.spi.remote.RequestHandlerSource;
 import org.jboss.cx.remoting.spi.remote.Handle;
 import org.jboss.cx.remoting.RemotingException;
+import java.io.IOException;
 
 /**
  *
  */
 public interface ServiceRegistry {
-    int bind(RequestHandlerSource requestHandlerSource) throws RemotingException;
+    int bind(RequestHandlerSource requestHandlerSource) throws IOException;
 
-    void bind(RequestHandlerSource requestHandlerSource, int id) throws RemotingException;
+    void bind(RequestHandlerSource requestHandlerSource, int id) throws IOException;
 
     void unbind(int id) throws RemotingException;
 
     void clear();
 
-    Handle<RequestHandlerSource> lookup(int id) throws RemotingException;
+    Handle<RequestHandlerSource> lookup(int id) throws IOException;
 }

Modified: remoting3/trunk/protocol/basic/src/main/java/org/jboss/cx/remoting/protocol/basic/ServiceRegistryImpl.java
===================================================================
--- remoting3/trunk/protocol/basic/src/main/java/org/jboss/cx/remoting/protocol/basic/ServiceRegistryImpl.java	2008-08-05 03:01:12 UTC (rev 4464)
+++ remoting3/trunk/protocol/basic/src/main/java/org/jboss/cx/remoting/protocol/basic/ServiceRegistryImpl.java	2008-08-05 03:03:07 UTC (rev 4465)
@@ -30,6 +30,7 @@
 import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.Iterator;
+import java.io.IOException;
 
 /**
  *
@@ -50,7 +51,7 @@
         parent = null;
     }
 
-    public int bind(final RequestHandlerSource requestHandlerSource) throws RemotingException {
+    public int bind(final RequestHandlerSource requestHandlerSource) throws IOException {
         final Handle<RequestHandlerSource> handle = requestHandlerSource.getHandle();
         boolean ok = false;
         try {
@@ -72,7 +73,7 @@
         }
     }
 
-    public void bind(final RequestHandlerSource requestHandlerSource, final int id) throws RemotingException {
+    public void bind(final RequestHandlerSource requestHandlerSource, final int id) throws IOException {
         final Handle<RequestHandlerSource> handle = requestHandlerSource.getHandle();
         boolean ok = false;
         try {
@@ -99,7 +100,7 @@
         }
     }
 
-    public Handle<RequestHandlerSource> lookup(final int id) throws RemotingException {
+    public Handle<RequestHandlerSource> lookup(final int id) throws IOException {
         final Handle<RequestHandlerSource> handle = map.get(Integer.valueOf(id));
         return handle != null || parent == null ? handle.getResource().getHandle() : parent.lookup(id);
     }

Modified: remoting3/trunk/protocol/basic/src/test/java/org/jboss/cx/remoting/protocol/basic/ConnectionTestCase.java
===================================================================
--- remoting3/trunk/protocol/basic/src/test/java/org/jboss/cx/remoting/protocol/basic/ConnectionTestCase.java	2008-08-05 03:01:12 UTC (rev 4464)
+++ remoting3/trunk/protocol/basic/src/test/java/org/jboss/cx/remoting/protocol/basic/ConnectionTestCase.java	2008-08-05 03:03:07 UTC (rev 4465)
@@ -30,6 +30,7 @@
 import java.util.concurrent.TimeUnit;
 import java.net.InetSocketAddress;
 import java.io.Closeable;
+import java.io.IOException;
 import junit.framework.TestCase;
 import org.jboss.cx.remoting.core.EndpointImpl;
 import org.jboss.cx.remoting.test.support.LoggingHelper;
@@ -37,7 +38,6 @@
 import org.jboss.cx.remoting.RemoteExecutionException;
 import org.jboss.cx.remoting.ClientSource;
 import org.jboss.cx.remoting.Client;
-import org.jboss.cx.remoting.RemotingException;
 import org.jboss.cx.remoting.AbstractRequestListener;
 import org.jboss.cx.remoting.spi.remote.RequestHandlerSource;
 import org.jboss.cx.remoting.spi.remote.Handle;
@@ -89,11 +89,11 @@
                             public void handleRequest(final RequestContext<Object> context, final Object request) throws RemoteExecutionException {
                                 try {
                                     context.sendReply(REPLY);
-                                } catch (RemotingException e) {
+                                } catch (IOException e) {
                                     problems.add(e);
                                 }
                             }
-                        }, INIT_ME, INIT_ME);
+                        }, null, null);
                         try {
                             serviceRegistry.bind(requestHandlerSourceHandle.getResource(), 13);
                             final IoHandlerFactory<AllocatedMessageChannel> handlerFactory = BasicProtocol.createServer(closeableExecutor, allocator, serviceRegistry);