Author: rahul
Date: Sat Dec 30 20:30:36 2006
New Revision: 491382
URL: http://svn.apache.org/viewvc?view=rev&rev=491382
Log:
Merge try/catch blocks for code from SHALE-263
Modified:
shale/framework/trunk/shale-dialog-scxml/src/main/java/org/apache/shale/dialog/scxml/SCXMLDialogContext.java
Modified:
shale/framework/trunk/shale-dialog-scxml/src/main/java/org/apache/shale/dialog/scxml/SCXMLDialogContext.java
URL:
http://svn.apache.org/viewvc/shale/framework/trunk/shale-dialog-scxml/src/main/java/org/apache/shale/dialog/scxml/SCXMLDialogContext.java?view=diff&rev=491382&r1=491381&r2=491382
==============================================================================
---
shale/framework/trunk/shale-dialog-scxml/src/main/java/org/apache/shale/dialog/scxml/SCXMLDialogContext.java
(original)
+++
shale/framework/trunk/shale-dialog-scxml/src/main/java/org/apache/shale/dialog/scxml/SCXMLDialogContext.java
Sat Dec 30 20:30:36 2006
@@ -385,17 +385,13 @@
Class dataClass = null;
try {
dataClass = loader.loadClass(dataClassName);
+ data = dataClass.newInstance();
} catch (Exception e) {
fireOnException(e);
}
- try {
- data = dataClass.newInstance();
- if (data instanceof DialogContextListener) {
- addDialogContextListener((DialogContextListener) data);
- }
- } catch (Exception e) {
- fireOnException(e);
+ if (data != null && data instanceof DialogContextListener) {
+ addDialogContextListener((DialogContextListener) data);
}
// set state machine in motion
