[Jboss-cvs] JBoss Messaging SVN: r1264 - in branches/Branch_1_0/src/main/org/jboss/jms: client/container client/delegate client/remoting server/endpoint server/plugin
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Sep 6 00:04:38 EDT 2006
Author: ovidiu.feodorov at jboss.com
Date: 2006-09-06 00:04:35 -0400 (Wed, 06 Sep 2006)
New Revision: 1264
Modified:
branches/Branch_1_0/src/main/org/jboss/jms/client/container/ConnectionAspect.java
branches/Branch_1_0/src/main/org/jboss/jms/client/delegate/ClientConsumerDelegate.java
branches/Branch_1_0/src/main/org/jboss/jms/client/delegate/DelegateSupport.java
branches/Branch_1_0/src/main/org/jboss/jms/client/remoting/CallbackServerFactory.java
branches/Branch_1_0/src/main/org/jboss/jms/server/endpoint/ServerConnectionFactoryEndpoint.java
branches/Branch_1_0/src/main/org/jboss/jms/server/plugin/JDBCChannelMapper.java
Log:
minor reformatting
Modified: branches/Branch_1_0/src/main/org/jboss/jms/client/container/ConnectionAspect.java
===================================================================
--- branches/Branch_1_0/src/main/org/jboss/jms/client/container/ConnectionAspect.java 2006-09-06 03:52:35 UTC (rev 1263)
+++ branches/Branch_1_0/src/main/org/jboss/jms/client/container/ConnectionAspect.java 2006-09-06 04:04:35 UTC (rev 1264)
@@ -104,7 +104,7 @@
justCreated = false;
- //This gets invoked on the server too
+ // this gets invoked on the server too
return invocation.invokeNext();
}
Modified: branches/Branch_1_0/src/main/org/jboss/jms/client/delegate/ClientConsumerDelegate.java
===================================================================
--- branches/Branch_1_0/src/main/org/jboss/jms/client/delegate/ClientConsumerDelegate.java 2006-09-06 03:52:35 UTC (rev 1263)
+++ branches/Branch_1_0/src/main/org/jboss/jms/client/delegate/ClientConsumerDelegate.java 2006-09-06 04:04:35 UTC (rev 1264)
@@ -59,7 +59,6 @@
public ClientConsumerDelegate(int objectID, int bufferSize)
{
super(objectID);
-
this.bufferSize = bufferSize;
}
Modified: branches/Branch_1_0/src/main/org/jboss/jms/client/delegate/DelegateSupport.java
===================================================================
--- branches/Branch_1_0/src/main/org/jboss/jms/client/delegate/DelegateSupport.java 2006-09-06 03:52:35 UTC (rev 1263)
+++ branches/Branch_1_0/src/main/org/jboss/jms/client/delegate/DelegateSupport.java 2006-09-06 04:04:35 UTC (rev 1264)
@@ -78,7 +78,6 @@
public DelegateSupport(int objectID)
{
this.id = objectID;
-
trace = log.isTraceEnabled();
}
Modified: branches/Branch_1_0/src/main/org/jboss/jms/client/remoting/CallbackServerFactory.java
===================================================================
--- branches/Branch_1_0/src/main/org/jboss/jms/client/remoting/CallbackServerFactory.java 2006-09-06 03:52:35 UTC (rev 1263)
+++ branches/Branch_1_0/src/main/org/jboss/jms/client/remoting/CallbackServerFactory.java 2006-09-06 04:04:35 UTC (rev 1264)
@@ -33,90 +33,91 @@
import org.jboss.remoting.transport.PortUtil;
/**
- *
+ *
* A CallbackServerFactory.
- *
+ *
* We maintain only one callbackserver per transport per client VM.
* This is to avoid having too many resources e.g. server sockets in use on the client
* E.g. in the case of a socket transport, if we had one callbackserver per connection then
* we would have one server socket listening per connection, so we could run out of available
* ports with a lot of connections.
- *
+ *
* @author <a href="tim.fox at jboss.com">Tim Fox</a>
* @version $Revision$
*
* $Id$
*/
public class CallbackServerFactory
-{
+{
private static final Logger log = Logger.getLogger(CallbackServerFactory.class);
-
+
private static final String CALLBACK_SERVER_PARAMS =
"/?marshaller=org.jboss.jms.server.remoting.JMSWireFormat&" +
"unmarshaller=org.jboss.jms.server.remoting.JMSWireFormat&" +
"dataType=jms&" +
"timeout=0&" +
"socket.check_connection=false";
-
+
public static final String JMS_CALLBACK_SUBSYSTEM = "CALLBACK";
-
- public static final String CLIENT_HOST = System.getProperty("jboss.messaging.callback.bind.address");
-
+
+ public static final String CLIENT_HOST =
+ System.getProperty("jboss.messaging.callback.bind.address");
+
public static CallbackServerFactory instance = new CallbackServerFactory();
-
+
private Map holders;
-
+
private CallbackServerFactory()
- {
+ {
holders = new HashMap();
}
-
+
public synchronized boolean containsCallbackServer(String protocol)
{
return holders.containsKey(protocol);
}
-
+
public synchronized Connector getCallbackServer(InvokerLocator serverLocator) throws Exception
{
String protocol = serverLocator.getProtocol();
-
- Holder h = (Holder)holders.get(protocol);
-
+
+ Holder h = (Holder)holders.get(protocol);
+
if (h == null)
- {
+ {
h = new Holder();
-
+
h.server = startCallbackServer(serverLocator);
-
+
holders.put(protocol, h);
}
else
{
h.refCount++;
}
-
+
return h.server;
}
-
+
public synchronized void stopCallbackServer(String protocol)
{
Holder h = (Holder)holders.get(protocol);
-
+
if (h == null)
{
throw new IllegalArgumentException("Cannot find callback server for protocol: " + protocol);
}
-
+
h.refCount--;
-
+
if (h.refCount == 0)
{
stopCallbackServer(h.server);
-
+
holders.remove(protocol);
- }
+ }
}
-
+
protected Connector startCallbackServer(InvokerLocator serverLocator) throws Exception
{
if (log.isTraceEnabled()) { log.trace(this + " setting up connection to " + serverLocator); }
@@ -128,12 +129,12 @@
int count = 0;
String thisAddress = CLIENT_HOST;
-
- if (thisAddress==null)
+
+ if (thisAddress == null)
{
- thisAddress = InetAddress.getLocalHost().getHostAddress();
+ thisAddress = InetAddress.getLocalHost().getHostAddress();
}
-
+
boolean isSSL = serverLocator.getProtocol().equals("sslsocket");
Map params = serverLocator.getParameters();
Modified: branches/Branch_1_0/src/main/org/jboss/jms/server/endpoint/ServerConnectionFactoryEndpoint.java
===================================================================
--- branches/Branch_1_0/src/main/org/jboss/jms/server/endpoint/ServerConnectionFactoryEndpoint.java 2006-09-06 03:52:35 UTC (rev 1263)
+++ branches/Branch_1_0/src/main/org/jboss/jms/server/endpoint/ServerConnectionFactoryEndpoint.java 2006-09-06 04:04:35 UTC (rev 1264)
@@ -130,9 +130,7 @@
log.debug("created and registered " + endpoint);
- ClientConnectionDelegate delegate = new ClientConnectionDelegate(connectionID);
-
- return delegate;
+ return new ClientConnectionDelegate(connectionID);
}
catch (Throwable t)
{
Modified: branches/Branch_1_0/src/main/org/jboss/jms/server/plugin/JDBCChannelMapper.java
===================================================================
--- branches/Branch_1_0/src/main/org/jboss/jms/server/plugin/JDBCChannelMapper.java 2006-09-06 03:52:35 UTC (rev 1263)
+++ branches/Branch_1_0/src/main/org/jboss/jms/server/plugin/JDBCChannelMapper.java 2006-09-06 04:04:35 UTC (rev 1264)
@@ -476,7 +476,7 @@
MemoryManager mm)
throws Exception
{
- // Look in memory first
+ // look in memory first
DurableSubscription sub = getDurableSubscription(clientID, subscriptionName);
if (sub != null)
@@ -484,7 +484,7 @@
return sub;
}
- //Now look in the db
+ // now look in the db
Connection conn = null;
PreparedStatement ps = null;
ResultSet rs = null;
@@ -573,21 +573,21 @@
wrap.end();
}
}
-
+
public DurableSubscription createDurableSubscription(String topicName,
- String clientID,
- String subscriptionName,
- String selector,
- boolean noLocal,
- MessageStore ms,
- PersistenceManager pm,
- MemoryManager mm) throws Exception
+ String clientID,
+ String subscriptionName,
+ String selector,
+ boolean noLocal,
+ MessageStore ms,
+ PersistenceManager pm,
+ MemoryManager mm) throws Exception
{
Selector sel = selector == null ? null : new Selector(selector);
long id;
- //First insert a row in the db
+ // first insert a row in the db
id = this.getNextId();
insertMappingRow(id, TYPE_DURABLE_SUB, topicName, subscriptionName, clientID,
@@ -1157,8 +1157,8 @@
throw new javax.jms.IllegalStateException("Topic " + topicName + " is not loaded");
}
- //We allocate an executor for the subscription from the rotating pool
- //Currently all subscriptions for the same topic share the same executor
+ // We allocate an executor for the subscription from the rotating pool.
+ // Currently all subscriptions for the same topic share the same executor.
QueuedExecutor executor = (QueuedExecutor)queuedExecutorPool.get(topicName);
DurableSubscription subscription =
More information about the jboss-cvs-commits
mailing list