Author: vanto
Date: Tue Jun 17 16:02:21 2008
New Revision: 668869
URL: http://svn.apache.org/viewvc?rev=668869&view=rev
Log:
Better error handling in PMAPI
Robustness in OMUtils.getTextAsQName
Modified:
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/ProcessAndInstanceManagementImpl.java
ode/trunk/il-common/src/main/java/org/apache/ode/il/DynamicService.java
ode/trunk/il-common/src/main/java/org/apache/ode/il/OMUtils.java
Modified:
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/ProcessAndInstanceManagementImpl.java
URL:
http://svn.apache.org/viewvc/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/ProcessAndInstanceManagementImpl.java?rev=668869&r1=668868&r2=668869&view=diff
==============================================================================
---
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/ProcessAndInstanceManagementImpl.java
(original)
+++
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/ProcessAndInstanceManagementImpl.java
Tue Jun 17 16:02:21 2008
@@ -597,6 +597,9 @@
private ProcessInfoDocument genProcessInfoDocument(final QName procid,
final ProcessInfoCustomizer custom)
throws ManagementException {
+ if (procid == null) {
+ throw new InvalidRequestException("Valid QName as process id
expected.");
+ }
ProcessInfoDocument ret = ProcessInfoDocument.Factory.newInstance();
final TProcessInfo pi = ret.addNewProcessInfo();
try {
Modified:
ode/trunk/il-common/src/main/java/org/apache/ode/il/DynamicService.java
URL:
http://svn.apache.org/viewvc/ode/trunk/il-common/src/main/java/org/apache/ode/il/DynamicService.java?rev=668869&r1=668868&r2=668869&view=diff
==============================================================================
--- ode/trunk/il-common/src/main/java/org/apache/ode/il/DynamicService.java
(original)
+++ ode/trunk/il-common/src/main/java/org/apache/ode/il/DynamicService.java Tue
Jun 17 16:02:21 2008
@@ -81,7 +81,7 @@
} catch (IllegalAccessException e) {
throw new RuntimeException("Couldn't invoke method named " +
methodName + " in management interface!", e);
} catch (InvocationTargetException e) {
- throw new RuntimeException("Invocation of method " + methodName +
" in management interface failed!", e.getTargetException());
+ throw new RuntimeException("Invocation of method " + methodName +
" in management interface failed: " + e.getTargetException().getMessage(),
e.getTargetException());
}
}
Modified: ode/trunk/il-common/src/main/java/org/apache/ode/il/OMUtils.java
URL:
http://svn.apache.org/viewvc/ode/trunk/il-common/src/main/java/org/apache/ode/il/OMUtils.java?rev=668869&r1=668868&r2=668869&view=diff
==============================================================================
--- ode/trunk/il-common/src/main/java/org/apache/ode/il/OMUtils.java (original)
+++ ode/trunk/il-common/src/main/java/org/apache/ode/il/OMUtils.java Tue Jun 17
16:02:21 2008
@@ -208,7 +208,7 @@
public static QName getTextAsQName(OMElement elmt) {
QName qname = elmt.getTextAsQName();
// The getTextAsQName is buggy, it sometimes return the full text
without extracting namespace
- if (qname.getNamespaceURI().length() == 0) {
+ if (qname == null || qname.getNamespaceURI().length() == 0) {
int colonIdx = elmt.getText().indexOf(":");
String localpart = elmt.getText().substring(colonIdx + 1,
elmt.getText().length());
String prefix = elmt.getText().substring(0, colonIdx);