merge branch 1.3.x obj module to OMRefactoring
Project: http://git-wip-us.apache.org/repos/asf/ode/repo Commit: http://git-wip-us.apache.org/repos/asf/ode/commit/c8688619 Tree: http://git-wip-us.apache.org/repos/asf/ode/tree/c8688619 Diff: http://git-wip-us.apache.org/repos/asf/ode/diff/c8688619 Branch: refs/heads/ODE-912 Commit: c86886199fa4e1d760c7c9400dd7d5fe1244825a Parents: 2215b11 Author: fangzhen <[email protected]> Authored: Thu Jul 31 16:27:09 2014 +0800 Committer: fangzhen <[email protected]> Committed: Thu Jul 31 16:27:09 2014 +0800 ---------------------------------------------------------------------- bpel-obj/src/main/java/org/apache/ode/bpel/o/OProcess.java | 7 ------- bpel-obj/src/main/java/org/apache/ode/bpel/o/OScope.java | 3 --- bpel-obj/src/main/java/org/apache/ode/bpel/o/Serializer.java | 7 ------- 3 files changed, 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ode/blob/c8688619/bpel-obj/src/main/java/org/apache/ode/bpel/o/OProcess.java ---------------------------------------------------------------------- diff --git a/bpel-obj/src/main/java/org/apache/ode/bpel/o/OProcess.java b/bpel-obj/src/main/java/org/apache/ode/bpel/o/OProcess.java index 20c7b0d..717b9e2 100644 --- a/bpel-obj/src/main/java/org/apache/ode/bpel/o/OProcess.java +++ b/bpel-obj/src/main/java/org/apache/ode/bpel/o/OProcess.java @@ -20,9 +20,6 @@ package org.apache.ode.bpel.o; import javax.wsdl.Operation; import javax.xml.namespace.QName; - -import org.apache.ode.utils.NSContext; - import java.io.IOException; import java.io.ObjectInputStream; import java.net.URI; @@ -79,8 +76,6 @@ public class OProcess extends OBase { public final HashMap<URI, OXslSheet> xslSheets = new HashMap<URI, OXslSheet>(); - public NSContext namespaceContext = null; - public OProcess(String bpelVersion) { super(null); this.version = bpelVersion; @@ -169,7 +164,6 @@ public class OProcess extends OBase { /** For BPEL 1.1 */ public OMessageVarType.Part part; - public String header; public OExpression location; @@ -183,7 +177,6 @@ public class OProcess extends OBase { StringBuffer buf = new StringBuffer(varType.toString()); buf.append('['); buf.append(part != null ? part.name : ""); - buf.append(header != null ? "header: " + header : ""); if (location != null) { buf.append("]["); buf.append(location.toString()); http://git-wip-us.apache.org/repos/asf/ode/blob/c8688619/bpel-obj/src/main/java/org/apache/ode/bpel/o/OScope.java ---------------------------------------------------------------------- diff --git a/bpel-obj/src/main/java/org/apache/ode/bpel/o/OScope.java b/bpel-obj/src/main/java/org/apache/ode/bpel/o/OScope.java index 8683650..bc76905 100644 --- a/bpel-obj/src/main/java/org/apache/ode/bpel/o/OScope.java +++ b/bpel-obj/src/main/java/org/apache/ode/bpel/o/OScope.java @@ -68,9 +68,6 @@ public class OScope extends OActivity { /** Is this scope <em>atomic</em> i.e. meant to execute in a single transaction. */ public boolean atomicScope; - /** Is this scope <em>isolated</em> i.e. protected against concurrent access to its variables. */ - public boolean isolatedScope; - public OScope(OProcess owner, OActivity parent) { super(owner, parent); } http://git-wip-us.apache.org/repos/asf/ode/blob/c8688619/bpel-obj/src/main/java/org/apache/ode/bpel/o/Serializer.java ---------------------------------------------------------------------- diff --git a/bpel-obj/src/main/java/org/apache/ode/bpel/o/Serializer.java b/bpel-obj/src/main/java/org/apache/ode/bpel/o/Serializer.java index 5c3e653..9ac0ae3 100644 --- a/bpel-obj/src/main/java/org/apache/ode/bpel/o/Serializer.java +++ b/bpel-obj/src/main/java/org/apache/ode/bpel/o/Serializer.java @@ -135,13 +135,6 @@ public class Serializer { oprocess = (OProcess) ois.readObject(); } catch (ClassNotFoundException e) { throw new IOException("DataStream Error", e); - } finally { - try { - if (ois != null) - ois.close(); - } catch (IOException e) { - - } } return oprocess;
