...
 
Commits (7)
......@@ -11,7 +11,7 @@
<parent>
<groupId>org.ow2.joram</groupId>
<artifactId>a3</artifactId>
<version>5.13.0-SNAPSHOT</version>
<version>5.13.1</version>
</parent>
<build>
......
......@@ -11,7 +11,7 @@
<parent>
<groupId>org.ow2.joram</groupId>
<artifactId>a3</artifactId>
<version>5.13.0-SNAPSHOT</version>
<version>5.13.1</version>
</parent>
<build>
......
......@@ -10,7 +10,7 @@
<parent>
<groupId>org.ow2.joram</groupId>
<artifactId>parent</artifactId>
<version>5.13.0-SNAPSHOT</version>
<version>5.13.1</version>
</parent>
<modules>
......
......@@ -11,7 +11,7 @@
<parent>
<groupId>org.ow2.joram</groupId>
<artifactId>a3</artifactId>
<version>5.13.0-SNAPSHOT</version>
<version>5.13.1</version>
</parent>
<build>
......
......@@ -11,7 +11,7 @@
<parent>
<groupId>org.ow2.joram</groupId>
<artifactId>a3</artifactId>
<version>5.13.0-SNAPSHOT</version>
<version>5.13.1</version>
</parent>
<build>
......
......@@ -10,7 +10,7 @@
<parent>
<groupId>org.ow2.joram</groupId>
<artifactId>parent</artifactId>
<version>5.13.0-SNAPSHOT</version>
<version>5.13.1</version>
</parent>
<build>
......
......@@ -9,7 +9,7 @@
<parent>
<artifactId>parent</artifactId>
<groupId>org.ow2.joram</groupId>
<version>5.13.0-SNAPSHOT</version>
<version>5.13.1</version>
</parent>
</project>
\ No newline at end of file
......@@ -11,7 +11,7 @@
<parent>
<groupId>org.ow2.joram</groupId>
<artifactId>jndi</artifactId>
<version>5.13.0-SNAPSHOT</version>
<version>5.13.1</version>
</parent>
<build>
......
......@@ -10,7 +10,7 @@
<parent>
<artifactId>parent</artifactId>
<groupId>org.ow2.joram</groupId>
<version>5.13.0-SNAPSHOT</version>
<version>5.13.1</version>
</parent>
<modules>
......
......@@ -11,7 +11,7 @@
<parent>
<groupId>org.ow2.joram</groupId>
<artifactId>jndi</artifactId>
<version>5.13.0-SNAPSHOT</version>
<version>5.13.1</version>
</parent>
<build>
......
......@@ -10,7 +10,7 @@
<parent>
<groupId>org.ow2.joram</groupId>
<artifactId>jndi</artifactId>
<version>5.13.0-SNAPSHOT</version>
<version>5.13.1</version>
</parent>
<build>
......
......@@ -10,7 +10,7 @@
<parent>
<groupId>org.ow2.joram</groupId>
<artifactId>joram-client</artifactId>
<version>5.13.0-SNAPSHOT</version>
<version>5.13.1</version>
</parent>
<build>
......
......@@ -11,7 +11,7 @@
<parent>
<groupId>org.ow2.joram</groupId>
<artifactId>joram-client</artifactId>
<version>5.13.0-SNAPSHOT</version>
<version>5.13.1</version>
</parent>
<properties>
......
/*
* Copyright (C) 2004 - 2013 ScalAgent Distributed Technologies
* Copyright (C) 2004 - 2018 ScalAgent Distributed Technologies
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
......@@ -293,9 +293,11 @@ public class ReliableTcpConnection {
if (messageId > inputCounter) {
inputCounter = messageId;
return obj;
} else if (logger.isLoggable(BasicLevel.DEBUG))
logger.log(BasicLevel.DEBUG,
" -> already received message: " + messageId + " " + obj);
} else {
logger.log(BasicLevel.WARN, " -> already received message: " + messageId + " " + obj);
// This should never happened, close the connection.
throw new IOException("Duplicate message: " + messageId);
}
}
} else {
if (obj != null) {
......
......@@ -10,7 +10,7 @@
<parent>
<groupId>org.ow2.joram</groupId>
<artifactId>joram</artifactId>
<version>5.13.0-SNAPSHOT</version>
<version>5.13.1</version>
</parent>
<modules>
......
......@@ -11,7 +11,7 @@
<parent>
<groupId>org.ow2.joram</groupId>
<artifactId>joram-client</artifactId>
<version>5.13.0-SNAPSHOT</version>
<version>5.13.1</version>
</parent>
<build>
......
......@@ -10,7 +10,7 @@
<parent>
<groupId>org.ow2.joram</groupId>
<artifactId>joram-jca</artifactId>
<version>5.13.0-SNAPSHOT</version>
<version>5.13.1</version>
</parent>
<build>
......
......@@ -10,7 +10,7 @@
<parent>
<groupId>org.ow2.joram</groupId>
<artifactId>joram-jca</artifactId>
<version>5.13.0-SNAPSHOT</version>
<version>5.13.1</version>
</parent>
</project>
\ No newline at end of file
......@@ -10,7 +10,7 @@
<parent>
<groupId>org.ow2.joram</groupId>
<artifactId>joram</artifactId>
<version>5.13.0-SNAPSHOT</version>
<version>5.13.1</version>
</parent>
<modules>
......
......@@ -10,7 +10,7 @@
<parent>
<groupId>org.ow2.joram</groupId>
<artifactId>joram-jca</artifactId>
<version>5.13.0-SNAPSHOT</version>
<version>5.13.1</version>
</parent>
<dependencies>
......
......@@ -10,7 +10,7 @@
<parent>
<groupId>org.ow2.joram</groupId>
<artifactId>joram-jca</artifactId>
<version>5.13.0-SNAPSHOT</version>
<version>5.13.1</version>
</parent>
<dependencies>
......
......@@ -11,7 +11,7 @@
<parent>
<groupId>org.ow2.joram</groupId>
<artifactId>joram-mom</artifactId>
<version>5.13.0-SNAPSHOT</version>
<version>5.13.1</version>
</parent>
<properties>
......
......@@ -11,7 +11,7 @@
<parent>
<groupId>org.ow2.joram</groupId>
<artifactId>joram-mom</artifactId>
<version>5.13.0-SNAPSHOT</version>
<version>5.13.1</version>
</parent>
<build>
......
/*
* JORAM: Java(TM) Open Reliable Asynchronous Messaging
* Copyright (C) 2006 - 2013 ScalAgent Distributed Technologies
* Copyright (C) 2006 - 2018 ScalAgent Distributed Technologies
* Copyright (C) 1996 - 2000 Dyade
*
* This library is free software; you can redistribute it and/or
......@@ -122,15 +122,13 @@ public class ReliableConnectionContext implements ConnectionContext, Serializabl
return queueWorker;
}
public void pushReply(AbstractJmsReply reply) {
public synchronized void pushReply(AbstractJmsReply reply) {
ProxyMessage msg = new ProxyMessage(outputCounter, inputCounter, reply);
if (noAckedQueue) {
add(msg);
} else {
queue.push(msg);
if (!noAckedQueue) {
outputCounter++;
}
outputCounter++;
}
}
......
......@@ -168,7 +168,7 @@ public class IOControl {
}
return new ProxyMessage(messageId, ackId, obj);
}
logger.log(BasicLevel.DEBUG, "IOControl.receive: already received message: " + messageId + " -> " + obj);
logger.log(BasicLevel.WARN, "IOControl.receive: already received message: " + messageId + " -> " + obj);
}
} catch (InterruptedException exc) {
if (logger.isLoggable(BasicLevel.DEBUG))
......
......@@ -10,7 +10,7 @@
<parent>
<groupId>org.ow2.joram</groupId>
<artifactId>joram-mom-extensions</artifactId>
<version>5.13.0-SNAPSHOT</version>
<version>5.13.1</version>
</parent>
<build>
......
......@@ -10,7 +10,7 @@
<parent>
<groupId>org.ow2.joram</groupId>
<artifactId>joram-mom-extensions</artifactId>
<version>5.13.0-SNAPSHOT</version>
<version>5.13.1</version>
</parent>
<build>
......
......@@ -10,7 +10,7 @@
<parent>
<groupId>org.ow2.joram</groupId>
<artifactId>joram-mom-extensions</artifactId>
<version>5.13.0-SNAPSHOT</version>
<version>5.13.1</version>
</parent>
<build>
......
......@@ -11,7 +11,7 @@
<parent>
<groupId>org.ow2.joram</groupId>
<artifactId>joram-mom-extensions</artifactId>
<version>5.13.0-SNAPSHOT</version>
<version>5.13.1</version>
</parent>
<build>
......
......@@ -144,8 +144,8 @@ public class JMSAcquisition implements AcquisitionDaemon {
if (logger.isLoggable(BasicLevel.DEBUG))
logger.log(BasicLevel.DEBUG, "JMS session closed: " + listener.session);
} catch (JMSException exc) {
if (logger.isLoggable(BasicLevel.DEBUG)) {
logger.log(BasicLevel.DEBUG, "Error while stopping JmsAcquisition.", exc);
if (logger.isLoggable(BasicLevel.INFO)) {
logger.log(BasicLevel.INFO, "Error while stopping JmsAcquisition.", exc);
}
}
// Remove ExceptionListener from JMSModule
......@@ -281,6 +281,8 @@ public class JMSAcquisition implements AcquisitionDaemon {
}
}
private boolean closing = false;
/** The daemon's loop. */
public void run() {
if (logmon.isLoggable(BasicLevel.DEBUG)) {
......@@ -313,12 +315,17 @@ public class JMSAcquisition implements AcquisitionDaemon {
logmon.log(BasicLevel.DEBUG, "update connections");
}
synchronized (modules) {
if (modules.size() == 0) stop();
// The ConnectionHandler is closing, modules can be locked by removeUpdateListener method.
if (! closing) {
synchronized (modules) {
if (modules.size() == 0) stop();
for (JMSAcquisition listener : modules) {
listener.updateConnections();
for (JMSAcquisition listener : modules) {
listener.updateConnections();
}
}
} else {
break;
}
}
} finally {
......@@ -346,10 +353,16 @@ public class JMSAcquisition implements AcquisitionDaemon {
}
protected void removeUpdateListener(JMSAcquisition module) {
synchronized (modules) {
modules.remove(module);
if (modules.size() == 0) stop();
}
// The closing field avoid a potential deadlock with daemon during stop.
closing = true;
try {
synchronized (modules) {
modules.remove(module);
if (modules.size() == 0) stop();
}
} finally {
closing = false;
}
}
}
}
......@@ -11,7 +11,7 @@
<parent>
<groupId>org.ow2.joram</groupId>
<artifactId>joram-mom-extensions</artifactId>
<version>5.13.0-SNAPSHOT</version>
<version>5.13.1</version>
</parent>
<build>
......
......@@ -10,7 +10,7 @@
<parent>
<groupId>org.ow2.joram</groupId>
<artifactId>joram-mom</artifactId>
<version>5.13.0-SNAPSHOT</version>
<version>5.13.1</version>
</parent>
<modules>
......
......@@ -10,7 +10,7 @@
<parent>
<groupId>org.ow2.joram</groupId>
<artifactId>joram-mom-extensions</artifactId>
<version>5.13.0-SNAPSHOT</version>
<version>5.13.1</version>
</parent>
<build>
......
......@@ -11,7 +11,7 @@
<parent>
<groupId>org.ow2.joram</groupId>
<artifactId>joram</artifactId>
<version>5.13.0-SNAPSHOT</version>
<version>5.13.1</version>
</parent>
<modules>
......
......@@ -10,7 +10,7 @@
<parent>
<artifactId>parent</artifactId>
<groupId>org.ow2.joram</groupId>
<version>5.13.0-SNAPSHOT</version>
<version>5.13.1</version>
</parent>
<modules>
......
......@@ -11,7 +11,7 @@
<parent>
<groupId>org.ow2.joram</groupId>
<artifactId>joram-security</artifactId>
<version>5.13.0-SNAPSHOT</version>
<version>5.13.1</version>
</parent>
<build>
......
......@@ -10,7 +10,7 @@
<parent>
<groupId>org.ow2.joram</groupId>
<artifactId>joram</artifactId>
<version>5.13.0-SNAPSHOT</version>
<version>5.13.1</version>
</parent>
<profiles>
......
......@@ -11,7 +11,7 @@
<parent>
<artifactId>joram</artifactId>
<groupId>org.ow2.joram</groupId>
<version>5.13.0-SNAPSHOT</version>
<version>5.13.1</version>
</parent>
<properties>
......
......@@ -11,7 +11,7 @@
<parent>
<groupId>org.ow2.joram</groupId>
<artifactId>joram-tools</artifactId>
<version>5.13.0-SNAPSHOT</version>
<version>5.13.1</version>
</parent>
<build>
......
......@@ -11,7 +11,7 @@
<parent>
<groupId>org.ow2.joram</groupId>
<artifactId>joram-tools</artifactId>
<version>5.13.0-SNAPSHOT</version>
<version>5.13.1</version>
</parent>
<build>
......
......@@ -11,7 +11,7 @@
<parent>
<groupId>org.ow2.joram</groupId>
<artifactId>joram-tools</artifactId>
<version>5.13.0-SNAPSHOT</version>
<version>5.13.0</version>
</parent>
<build>
......
......@@ -11,7 +11,7 @@
<parent>
<groupId>org.ow2.joram</groupId>
<artifactId>joram</artifactId>
<version>5.13.0-SNAPSHOT</version>
<version>5.13.1</version>
</parent>
<modules>
......
......@@ -11,7 +11,7 @@
<parent>
<groupId>org.ow2.joram</groupId>
<artifactId>joram-tools-rest</artifactId>
<version>5.13.0-SNAPSHOT</version>
<version>5.13.1</version>
</parent>
<build>
......
......@@ -11,7 +11,7 @@
<parent>
<groupId>org.ow2.joram</groupId>
<artifactId>joram-tools-rest</artifactId>
<version>5.13.0-SNAPSHOT</version>
<version>5.13.1</version>
</parent>
<build>
......
......@@ -11,7 +11,7 @@
<parent>
<groupId>org.ow2.joram</groupId>
<artifactId>joram-tools-rest</artifactId>
<version>5.13.0-SNAPSHOT</version>
<version>5.13.1</version>
</parent>
<build>
......
......@@ -11,7 +11,7 @@
<parent>
<groupId>org.ow2.joram</groupId>
<artifactId>joram-tools</artifactId>
<version>5.13.0-SNAPSHOT</version>
<version>5.13.1</version>
</parent>
<modules>
......
......@@ -9,7 +9,7 @@
<parent>
<artifactId>parent</artifactId>
<groupId>org.ow2.joram</groupId>
<version>5.13.0-SNAPSHOT</version>
<version>5.13.1</version>
</parent>
</project>
\ No newline at end of file
......@@ -6,7 +6,7 @@
<artifactId>parent</artifactId>
<packaging>pom</packaging>
<!-- version : major.minor.build -->
<version>5.13.0-SNAPSHOT</version>
<version>5.13.1</version>
<name>JORAM</name>
<url>http://maven.apache.org</url>
<description>Builds the Joram project.</description>
......
......@@ -11,7 +11,7 @@
<parent>
<groupId>org.ow2.joram</groupId>
<artifactId>parent</artifactId>
<version>5.13.0-SNAPSHOT</version>
<version>5.13.1</version>
</parent>
<build>
......
......@@ -10,7 +10,7 @@
<parent>
<artifactId>parent</artifactId>
<groupId>org.ow2.joram</groupId>
<version>5.13.0-SNAPSHOT</version>
<version>5.13.1</version>
</parent>
<build>
......
......@@ -11,7 +11,7 @@
<parent>
<groupId>org.ow2.joram</groupId>
<artifactId>shell</artifactId>
<version>5.13.0-SNAPSHOT</version>
<version>5.13.1</version>
</parent>
<build>
......
......@@ -9,7 +9,7 @@
<parent>
<groupId>org.ow2.joram</groupId>
<artifactId>shell</artifactId>
<version>5.13.0-SNAPSHOT</version>
<version>5.13.1</version>
</parent>
<build>
......
......@@ -9,7 +9,7 @@
<parent>
<groupId>org.ow2.joram</groupId>
<artifactId>shell</artifactId>
<version>5.13.0-SNAPSHOT</version>
<version>5.13.1</version>
</parent>
<build>
......
......@@ -9,7 +9,7 @@
<parent>
<groupId>org.ow2.joram</groupId>
<artifactId>parent</artifactId>
<version>5.13.0-SNAPSHOT</version>
<version>5.13.1</version>
</parent>
<modules>
......
......@@ -17,7 +17,7 @@
</parent>
<properties>
<joram.version>5.13.0-SNAPSHOT</joram.version>
<joram.version>5.13.0</joram.version>
</properties>
<build>
......