summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormikaelpeltier <mikaelpeltier@google.com>2015-06-24 14:55:08 +0200
committerMikael Peltier <mikaelpeltier@google.com>2015-06-24 15:01:08 +0000
commitd0dbb08d4c1e393d6d7c17bbb19d7d8d98c80ec7 (patch)
tree790ebd0d93b46bbda91ad4aad0b4cbf9aa5ad15b
parent04563874ddaac702d6c715eaa89c29b253f4c54e (diff)
downloadtoolchain_jack-d0dbb08d4c1e393d6d7c17bbb19d7d8d98c80ec7.tar.gz
toolchain_jack-d0dbb08d4c1e393d6d7c17bbb19d7d8d98c80ec7.tar.bz2
toolchain_jack-d0dbb08d4c1e393d6d7c17bbb19d7d8d98c80ec7.zip
Update prebuilts of simpleframework
- Explain how prebuilts can be rebuilt from source files - Fix bug into SocketListenerManager that prevent to stop thread created by SocketListener. Indeed, listener.process can throws exceptions that prevent listener to be add into listeners list that will be used to close SocketListener. Change-Id: I0c9f8742ef132a5a77777ecb9df07a48ce05200c (cherry picked from commit a644312d924bc48bffcb2feaeed0c8f2aa08ffd4)
-rw-r--r--simple/PREBUILT11
-rw-r--r--simple/simple-common-6.0.1.jarbin44262 -> 44261 bytes
-rw-r--r--simple/simple-http-6.0.1.jarbin176270 -> 176269 bytes
-rw-r--r--simple/simple-transport-6.0.1.jarbin70497 -> 70497 bytes
-rw-r--r--simple/simple-transport/src/main/java/org/simpleframework/transport/connect/SocketListenerManager.java4
5 files changed, 6 insertions, 9 deletions
diff --git a/simple/PREBUILT b/simple/PREBUILT
index f69b00b1..884863ed 100644
--- a/simple/PREBUILT
+++ b/simple/PREBUILT
@@ -1,8 +1,5 @@
-The objects in this prebuilt directory can be rebuilt
-using the archive
-
-http://www.simpleframework.org/download/download.php?version=6.0.1&package=simple-6.0.1.tar.gz
-
-An then doing:
+Prebuilts (simple-common-6.0.1.jar, simple-http-6.0.1.jar, simple-transport-6.0.1.jar) can be rebuilt by using the following command lines:
mvn install
-
+cp simple-http/target/simple-http-6.0.1.jar simple-http-6.0.1.jar
+cp simple-common/target/simple-common-6.0.1.jar simple-common-6.0.1.jar
+cp simple-transport/target/simple-transport-6.0.1.jar simple-transport-6.0.1.jar
diff --git a/simple/simple-common-6.0.1.jar b/simple/simple-common-6.0.1.jar
index edb63191..039e7131 100644
--- a/simple/simple-common-6.0.1.jar
+++ b/simple/simple-common-6.0.1.jar
Binary files differ
diff --git a/simple/simple-http-6.0.1.jar b/simple/simple-http-6.0.1.jar
index c1b1c767..e165cfeb 100644
--- a/simple/simple-http-6.0.1.jar
+++ b/simple/simple-http-6.0.1.jar
Binary files differ
diff --git a/simple/simple-transport-6.0.1.jar b/simple/simple-transport-6.0.1.jar
index 6812525b..87b1dc89 100644
--- a/simple/simple-transport-6.0.1.jar
+++ b/simple/simple-transport-6.0.1.jar
Binary files differ
diff --git a/simple/simple-transport/src/main/java/org/simpleframework/transport/connect/SocketListenerManager.java b/simple/simple-transport/src/main/java/org/simpleframework/transport/connect/SocketListenerManager.java
index b0330f18..f11f8b9d 100644
--- a/simple/simple-transport/src/main/java/org/simpleframework/transport/connect/SocketListenerManager.java
+++ b/simple/simple-transport/src/main/java/org/simpleframework/transport/connect/SocketListenerManager.java
@@ -101,8 +101,8 @@ class SocketListenerManager implements Closeable {
SocketListener listener = new SocketListener(address, processor, analyzer, context);
if(processor != null) {
- listener.process();
listeners.add(listener);
+ listener.process();
}
return listener.getAddress();
}
@@ -124,4 +124,4 @@ class SocketListenerManager implements Closeable {
}
listeners.clear();
}
-} \ No newline at end of file
+}