? 138769.patch
Index: src/com/sun/jbi/engine/bpel/core/bpel/debug/BPELProcessInstanceRefImpl.java
===================================================================
RCS file: /cvs/open-jbi-components/ojc-core/bpelse/bpelcore/src/com/sun/jbi/engine/bpel/core/bpel/debug/BPELProcessInstanceRefImpl.java,v
retrieving revision 1.2
diff -r1.2 BPELProcessInstanceRefImpl.java
33,34d32
< import com.sun.bpel.model.CorrelationSets;
< import com.sun.bpel.model.meta.RCorrelationSet;
39d36
< import com.sun.jbi.engine.bpel.core.bpel.engine.impl.CorrelatingSAInComingEventKeyImpl;
42d38
< import java.util.ArrayList;
46d41
< import java.util.List;
48d42
< import java.util.Set;
171a166
>     @Override
175a171
>     @Override
179a176
>     @Override
Index: src/com/sun/jbi/engine/bpel/core/bpel/debug/BPELVariableImpl.java
===================================================================
RCS file: /cvs/open-jbi-components/ojc-core/bpelse/bpelcore/src/com/sun/jbi/engine/bpel/core/bpel/debug/BPELVariableImpl.java,v
retrieving revision 1.1
diff -r1.1 BPELVariableImpl.java
106c106
<     		return null;
---
>             return null;
107a108
>         
110,111c111,113
<         } else if (isInitialized()) {
<             return new WSDLMessageImpl(mModel.getWSDLMessageType(), mData.getWSMessage());   
---
>         } else if (isInitialized() && (mData.getWSMessage() != null)) {
>             return new WSDLMessageImpl(
>                     mModel.getWSDLMessageType(), mData.getWSMessage());   
112a115
>         
114d116
<      
124,125c126,127
< 
<         String result = "";
---
>         String result = null;
>         
127c129
<     		return null;
---
>             return null;
128a131
>         
131,140c134,145
<         } else if (isInitialized ()) {
<         Object variableData = mData.getXSDVariableData();
<         if (variableData != null) {
<             if (variableData instanceof Element) {
<                 result = DOMHelper.createXmlString((Element) variableData);
<             } else if (variableData instanceof Document) {
<                 result = DOMHelper.createXmlString(((Document) variableData)
<                         .getDocumentElement());
<             } else {
<                 result = variableData.toString();
---
>         } else if (isInitialized ()) {    
>             final Object variableData = mData.getXSDVariableData();
>             
>             if (variableData != null) {
>                 if (variableData instanceof Element) {
>                     result = DOMHelper.createXmlString((Element) variableData);
>                 } else if (variableData instanceof Document) {
>                     result = DOMHelper.createXmlString(((Document) variableData)
>                             .getDocumentElement());
>                 } else {
>                     result = variableData.toString();
>                 }
143c148
<         }
---
>         
Index: src/com/sun/jbi/engine/bpel/core/bpel/engine/impl/CorrelationVal.java
===================================================================
RCS file: /cvs/open-jbi-components/ojc-core/bpelse/bpelcore/src/com/sun/jbi/engine/bpel/core/bpel/engine/impl/CorrelationVal.java,v
retrieving revision 1.5
diff -r1.5 CorrelationVal.java
174a175,180
>     /**
>      * Returns the nubmber of property aliases defined for this correlation value. If
>      * the process instance was recovered and we do not know this, returns 0.
>      * 
>      * @return The number of property aliases or 0 if the information is not available.
>      */
175a182,183
>         if (mPropAliases == null) return 0;
>         
179a188,189
>         if (mPropAliases == null) return null;
>         
183a194,195
>         if (mPropAliases == null) return null;
>         
187a200,201
>         if (mPropAliases == null) return null;
>         
191a206,207
>         if (mPropAliases == null) return null;
>