[jboss-cvs] JBossRemoting/src/main/org/jboss/remoting ...
Ovidiu Feodorov
ovidiu.feodorov at jboss.com
Tue Jan 16 03:15:03 EST 2007
User: ovidiu
Date: 07/01/16 03:15:03
Modified: src/main/org/jboss/remoting Tag: remoting_2_x
MicroRemoteClientInvoker.java ServerInvoker.java
Log:
flushing minor changes (trivial refactoring, logging improvments) before attempting a fix for http://jira.jboss.org/jira/browse/JBREM-666
Revision Changes Path
No revision
No revision
1.7.2.3 +7 -9 JBossRemoting/src/main/org/jboss/remoting/MicroRemoteClientInvoker.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: MicroRemoteClientInvoker.java
===================================================================
RCS file: /cvsroot/jboss/JBossRemoting/src/main/org/jboss/remoting/MicroRemoteClientInvoker.java,v
retrieving revision 1.7.2.2
retrieving revision 1.7.2.3
diff -u -b -r1.7.2.2 -r1.7.2.3
--- MicroRemoteClientInvoker.java 13 Jan 2007 12:42:34 -0000 1.7.2.2
+++ MicroRemoteClientInvoker.java 16 Jan 2007 08:15:03 -0000 1.7.2.3
@@ -27,10 +27,13 @@
*
* @author <a href="mailto:jhaynie at vocalocity.net">Jeff Haynie</a>
* @author <a href="mailto:telrod at e2technologies.net">Tom Elrod</a>
- * @version $Revision: 1.7.2.2 $
+ * @version $Revision: 1.7.2.3 $
*/
public abstract class MicroRemoteClientInvoker extends AbstractInvoker implements ClientInvoker
{
+ private static final Logger log = Logger.getLogger(MicroRemoteClientInvoker.class);
+ private boolean trace = log.isTraceEnabled();
+
protected boolean connected = false;
private Marshaller marshaller;
private UnMarshaller unmarshaller;
@@ -39,9 +42,6 @@
private LeasePinger leasePinger = null;
private String invokerSessionId = new GUID().toString();
- private static final Logger log = Logger.getLogger(MicroRemoteClientInvoker.class);
- private boolean trace = log.isTraceEnabled();
-
public MicroRemoteClientInvoker(InvokerLocator locator)
{
super(locator);
@@ -244,10 +244,12 @@
{
if (!connected)
{
- log.debug("connect called for: " + this);
+ log.debug(this + " connecting");
handleConnect();
connected = true;
+
+ log.debug(this + " connected");
}
}
@@ -398,8 +400,6 @@
* get to marshal the data. Will first check the locator uri for a 'datatype'
* parameter and take that value if it exists. Otherwise, will use the
* default datatype for the client invoker, based on transport.
- *
- * @return
*/
private String getDataType()
{
@@ -437,8 +437,6 @@
* Each implementation of the remote client invoker should have
* a default data type that is uses in the case it is not specified
* in the invoker locator uri.
- *
- * @return
*/
protected abstract String getDefaultDataType();
1.52.2.15 +6 -10 JBossRemoting/src/main/org/jboss/remoting/ServerInvoker.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ServerInvoker.java
===================================================================
RCS file: /cvsroot/jboss/JBossRemoting/src/main/org/jboss/remoting/ServerInvoker.java,v
retrieving revision 1.52.2.14
retrieving revision 1.52.2.15
diff -u -b -r1.52.2.14 -r1.52.2.15
--- ServerInvoker.java 16 Jan 2007 05:51:53 -0000 1.52.2.14
+++ ServerInvoker.java 16 Jan 2007 08:15:03 -0000 1.52.2.15
@@ -32,7 +32,6 @@
import org.jboss.remoting.security.ServerSocketFactoryMBean;
import org.jboss.remoting.security.ServerSocketFactoryWrapper;
import org.jboss.remoting.socketfactory.CreationListenerServerSocketFactory;
-import org.jboss.remoting.socketfactory.CreationListenerSocketFactory;
import org.jboss.remoting.socketfactory.SocketCreationListener;
import org.jboss.remoting.stream.StreamHandler;
import org.jboss.remoting.stream.StreamInvocationHandler;
@@ -49,7 +48,6 @@
import javax.management.MalformedObjectNameException;
import javax.management.ObjectName;
import javax.net.ServerSocketFactory;
-import javax.net.SocketFactory;
import java.io.IOException;
import java.lang.reflect.Constructor;
@@ -65,7 +63,7 @@
*
* @author <a href="mailto:jhaynie at vocalocity.net">Jeff Haynie</a>
* @author <a href="mailto:tom.elrod at jboss.com">Tom Elrod</a>
- * @version $Revision: 1.52.2.14 $
+ * @version $Revision: 1.52.2.15 $
*/
public abstract class ServerInvoker extends AbstractInvoker implements ServerInvokerMBean
{
@@ -469,11 +467,13 @@
if(serverSocketFactory == null)
{
- log.debug("Did not find server socket factory configuration as mbean service or classname. Creating default server socket.");
+ log.debug(this + " did not find server socket factory configuration as mbean service " +
+ "or classname. Creating default server socket factory.");
+
serverSocketFactory = getDefaultServerSocketFactory();
}
- log.debug("Created server socket factory: " + serverSocketFactory);
+ log.debug(this + " created server socket factory " + serverSocketFactory);
serverSocketFactory = wrapServerSocketFactory(serverSocketFactory, configuration);
return serverSocketFactory;
@@ -1455,9 +1455,7 @@
}
/**
- * Gets teh server invoker's transport specific configuration.
- *
- * @return
+ * Gets the server invoker's transport specific configuration.
*/
public Map getConfiguration()
{
@@ -1466,8 +1464,6 @@
/**
* Returns the String for the object name to be used for the invoker.
- *
- * @return
*/
public String getMBeanObjectName()
{
More information about the jboss-cvs-commits
mailing list