Author: rahul
Date: Wed Apr 26 15:39:42 2006
New Revision: 397325
URL: http://svn.apache.org/viewcvs?rev=397325&view=rev
Log:
BZ 39415
Supplying a PathResolver is recommended best practice, but not having one
should have the same effect of calling Digester#parse(String) with the literal
value of the @src for <state>.
Modified:
jakarta/commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/io/SCXMLDigester.java
Modified:
jakarta/commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/io/SCXMLDigester.java
URL:
http://svn.apache.org/viewcvs/jakarta/commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/io/SCXMLDigester.java?rev=397325&r1=397324&r2=397325&view=diff
==============================================================================
---
jakarta/commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/io/SCXMLDigester.java
(original)
+++
jakarta/commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/io/SCXMLDigester.java
Wed Apr 26 15:39:42 2006
@@ -1299,14 +1299,15 @@
Digester digester = getDigester();
SCXML scxml = (SCXML) digester.peek(digester.getCount() - 1);
// 1) Digest the external SCXML file
- Digester externalSrcDigester = newInstance(scxml,
- pr.getResolver(src));
SCXML externalSCXML = null;
- String path = null;
+ String path;
+ Digester externalSrcDigester;
if (pr == null) {
path = src;
+ externalSrcDigester = newInstance(scxml, null);
} else {
path = pr.resolvePath(src);
+ externalSrcDigester = newInstance(scxml, pr.getResolver(src));
}
try {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
