Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorafinkbein2010-03-15 20:48:12 -0400
committerafinkbein2010-03-15 20:48:12 -0400
commitb8d7b4439fd92fb94329ada6bb6422cf76f0c876 (patch)
tree758136ea22a5b05832d849654ab612bdc61603b7 /plugins/org.eclipse.osee.framework.messaging
parenta2a3c1d6118ea39fa310815b5af513d132270731 (diff)
downloadorg.eclipse.osee-b8d7b4439fd92fb94329ada6bb6422cf76f0c876.tar.gz
org.eclipse.osee-b8d7b4439fd92fb94329ada6bb6422cf76f0c876.tar.xz
org.eclipse.osee-b8d7b4439fd92fb94329ada6bb6422cf76f0c876.zip
client ote messaging fixes
Diffstat (limited to 'plugins/org.eclipse.osee.framework.messaging')
-rw-r--r--plugins/org.eclipse.osee.framework.messaging/src/org/eclipse/osee/framework/messaging/internal/MessageServiceProviderImpl.java2
-rw-r--r--plugins/org.eclipse.osee.framework.messaging/src/org/eclipse/osee/framework/messaging/internal/activemq/ConnectionNodeActiveMq.java3
-rw-r--r--plugins/org.eclipse.osee.framework.messaging/src/org/eclipse/osee/framework/messaging/services/internal/RemoteServiceLookupImpl.java2
3 files changed, 4 insertions, 3 deletions
diff --git a/plugins/org.eclipse.osee.framework.messaging/src/org/eclipse/osee/framework/messaging/internal/MessageServiceProviderImpl.java b/plugins/org.eclipse.osee.framework.messaging/src/org/eclipse/osee/framework/messaging/internal/MessageServiceProviderImpl.java
index 846e5a894e..3422184cf8 100644
--- a/plugins/org.eclipse.osee.framework.messaging/src/org/eclipse/osee/framework/messaging/internal/MessageServiceProviderImpl.java
+++ b/plugins/org.eclipse.osee.framework.messaging/src/org/eclipse/osee/framework/messaging/internal/MessageServiceProviderImpl.java
@@ -26,7 +26,7 @@ public class MessageServiceProviderImpl implements MessageServiceProvider {
}
public void start() throws Exception {
- Thread.currentThread().setContextClassLoader(contextClassLoader);
+// Thread.currentThread().setContextClassLoader(contextClassLoader);
executor = Executors.newFixedThreadPool(Runtime.getRuntime().availableProcessors());
messageService = new MessageServiceImpl(new ConnectionNodeFactoryImpl("1.0", Integer.toString(hashCode()), executor));
}
diff --git a/plugins/org.eclipse.osee.framework.messaging/src/org/eclipse/osee/framework/messaging/internal/activemq/ConnectionNodeActiveMq.java b/plugins/org.eclipse.osee.framework.messaging/src/org/eclipse/osee/framework/messaging/internal/activemq/ConnectionNodeActiveMq.java
index fafe62becb..28d7ef33b1 100644
--- a/plugins/org.eclipse.osee.framework.messaging/src/org/eclipse/osee/framework/messaging/internal/activemq/ConnectionNodeActiveMq.java
+++ b/plugins/org.eclipse.osee.framework.messaging/src/org/eclipse/osee/framework/messaging/internal/activemq/ConnectionNodeActiveMq.java
@@ -82,7 +82,7 @@ class ConnectionNodeActiveMq implements ConnectionNodeFailoverSupport, MessageLi
replyProducer = session.createProducer(null);
connection.start();
started = true;
- } catch (JMSException ex) {
+ } catch (Throwable ex) {
throw new OseeWrappedException(ex);
}
}
@@ -181,6 +181,7 @@ class ConnectionNodeActiveMq implements ConnectionNodeFailoverSupport, MessageLi
consumer.setMessageListener(null);
consumer.close();
messageConsumerCache.remove(topic);
+ regularListeners.remove(messageId.getGuid());
} catch (JMSException ex) {
statusCallback.fail(ex);
}
diff --git a/plugins/org.eclipse.osee.framework.messaging/src/org/eclipse/osee/framework/messaging/services/internal/RemoteServiceLookupImpl.java b/plugins/org.eclipse.osee.framework.messaging/src/org/eclipse/osee/framework/messaging/services/internal/RemoteServiceLookupImpl.java
index 632b24ca1c..5f7c22228b 100644
--- a/plugins/org.eclipse.osee.framework.messaging/src/org/eclipse/osee/framework/messaging/services/internal/RemoteServiceLookupImpl.java
+++ b/plugins/org.eclipse.osee.framework.messaging/src/org/eclipse/osee/framework/messaging/services/internal/RemoteServiceLookupImpl.java
@@ -33,7 +33,7 @@ public class RemoteServiceLookupImpl implements RemoteServiceLookup {
private CompositeKeyHashMap<String, String, List<ServiceNotification>> callbacks;
private HealthServiceListener healthServiceListener;
- public RemoteServiceLookupImpl(ConnectionNode node, ScheduledExecutorService executor) {
+ public RemoteServiceLookupImpl(ConnectionNode node, ScheduledExecutorService executor) {
this.connectionNode = node;
map = new CompositeKeyHashMap<String, String, Map<String, ServiceHealthPlusTimeout>>(25, true);
callbacks = new CompositeKeyHashMap<String, String, List<ServiceNotification>>(

Back to the top