You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ode.apache.org by va...@apache.org on 2014/07/23 16:57:17 UTC
[1/2] git commit: bump version to 2.0a,
which is the version that is still compatible with ODE master.
Repository: ode-jacob
Updated Branches:
refs/heads/2.0a [created] 05e88d3d4
bump version to 2.0a, which is the version that is still compatible with ODE master.
Project: http://git-wip-us.apache.org/repos/asf/ode-jacob/repo
Commit: http://git-wip-us.apache.org/repos/asf/ode-jacob/commit/e7ce2b44
Tree: http://git-wip-us.apache.org/repos/asf/ode-jacob/tree/e7ce2b44
Diff: http://git-wip-us.apache.org/repos/asf/ode-jacob/diff/e7ce2b44
Branch: refs/heads/2.0a
Commit: e7ce2b440ef949c016c3178e69f9316f5d0a80eb
Parents: a5c5ae7
Author: Tammo van Lessen <va...@apache.org>
Authored: Wed Jul 23 16:50:55 2014 +0200
Committer: Tammo van Lessen <va...@apache.org>
Committed: Wed Jul 23 16:50:55 2014 +0200
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ode-jacob/blob/e7ce2b44/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index ee20eda..847bf35 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
<groupId>org.apache.ode</groupId>
<artifactId>jacob</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0a-SNAPSHOT</version>
<packaging>jar</packaging>
<name>ODE :: JACOB</name>
[2/2] git commit: allow the replacement of non-serializable objects.
Posted by va...@apache.org.
allow the replacement of non-serializable objects.
Project: http://git-wip-us.apache.org/repos/asf/ode-jacob/repo
Commit: http://git-wip-us.apache.org/repos/asf/ode-jacob/commit/05e88d3d
Tree: http://git-wip-us.apache.org/repos/asf/ode-jacob/tree/05e88d3d
Diff: http://git-wip-us.apache.org/repos/asf/ode-jacob/diff/05e88d3d
Branch: refs/heads/2.0a
Commit: 05e88d3d46adebe07813dbea55997aeac335c9b3
Parents: e7ce2b4
Author: Tammo van Lessen <va...@apache.org>
Authored: Wed Jul 23 16:51:48 2014 +0200
Committer: Tammo van Lessen <va...@apache.org>
Committed: Wed Jul 23 16:51:48 2014 +0200
----------------------------------------------------------------------
src/main/java/org/apache/ode/jacob/vpu/ExecutionQueueImpl.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ode-jacob/blob/05e88d3d/src/main/java/org/apache/ode/jacob/vpu/ExecutionQueueImpl.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/ode/jacob/vpu/ExecutionQueueImpl.java b/src/main/java/org/apache/ode/jacob/vpu/ExecutionQueueImpl.java
index a6c0837..e046b73 100644
--- a/src/main/java/org/apache/ode/jacob/vpu/ExecutionQueueImpl.java
+++ b/src/main/java/org/apache/ode/jacob/vpu/ExecutionQueueImpl.java
@@ -681,8 +681,9 @@ public class ExecutionQueueImpl implements ExecutionQueue {
* @throws IOException
*/
protected Object replaceObject(Object obj) throws IOException {
- if (!Serializable.class.isAssignableFrom(obj.getClass())) {
- throw new IllegalArgumentException("Cannot replace non Serializable instance of " + obj.getClass());
+ if (!Serializable.class.isAssignableFrom(obj.getClass()) &&
+ !(_replacementMap != null && _replacementMap.isReplaceable(obj))) {
+ throw new IllegalArgumentException("Cannot replace non-serializable or non-replacable instance of " + obj.getClass());
}
if (obj instanceof org.apache.ode.jacob.ChannelProxy) {