Author: jholmes
Date: Tue Jul 17 10:30:58 2007
New Revision: 556983
URL: http://svn.apache.org/viewvc?view=rev&rev=556983
Log:
WW-1703 NullPointer in SiteGraph
Modified:
struts/struts2/trunk/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/renderers/DOTRenderer.java
struts/struts2/trunk/plugins/sitegraph/src/test/resources/org/apache/struts2/sitegraph/out.txt
struts/struts2/trunk/plugins/sitegraph/src/test/resources/org/apache/struts2/sitegraph/struts.xml
Modified:
struts/struts2/trunk/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/renderers/DOTRenderer.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/renderers/DOTRenderer.java?view=diff&rev=556983&r1=556982&r2=556983
==============================================================================
---
struts/struts2/trunk/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/renderers/DOTRenderer.java
(original)
+++
struts/struts2/trunk/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/renderers/DOTRenderer.java
Tue Jul 17 10:30:58 2007
@@ -125,7 +125,11 @@
} else if (resultClassName.indexOf("Redirect") != -1) {
// check if the redirect is to an action -- if so,
link it
- String location = getViewLocation((String)
resultConfig.getParams().get("location"), namespace);
+ String locationConfig = (String)
resultConfig.getParams().get("location");
+ if (locationConfig == null) {
+ locationConfig = (String)
resultConfig.getParams().get("actionName");
+ }
+ String location = getViewLocation(locationConfig,
namespace);
// FIXME: work with new configuration style
if (location.endsWith("action")) {
addTempLink(action, location, Link.TYPE_REDIRECT,
resultConfig.getName());
Modified:
struts/struts2/trunk/plugins/sitegraph/src/test/resources/org/apache/struts2/sitegraph/out.txt
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/sitegraph/src/test/resources/org/apache/struts2/sitegraph/out.txt?view=diff&rev=556983&r1=556982&r2=556983
==============================================================================
---
struts/struts2/trunk/plugins/sitegraph/src/test/resources/org/apache/struts2/sitegraph/out.txt
(original)
+++
struts/struts2/trunk/plugins/sitegraph/src/test/resources/org/apache/struts2/sitegraph/out.txt
Tue Jul 17 10:30:58 2007
@@ -28,5 +28,6 @@
tutorial_sitegraph_guess_success_jsp -> tutorial_sitegraph_guess
[label="href\n(!default)"];
hello -> hello_jsp [label="success",color="darkseagreen2"];
hello -> tutorial_test [label="redirect: tutorial"];
+ hello -> tutorial_test [label="redirect: tutorial2"];
tutorial_test -> tutorial_sitegraph_guess_input_ftl
[label="input",color="darkseagreen2"];
}
Modified:
struts/struts2/trunk/plugins/sitegraph/src/test/resources/org/apache/struts2/sitegraph/struts.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/sitegraph/src/test/resources/org/apache/struts2/sitegraph/struts.xml?view=diff&rev=556983&r1=556982&r2=556983
==============================================================================
---
struts/struts2/trunk/plugins/sitegraph/src/test/resources/org/apache/struts2/sitegraph/struts.xml
(original)
+++
struts/struts2/trunk/plugins/sitegraph/src/test/resources/org/apache/struts2/sitegraph/struts.xml
Tue Jul 17 10:30:58 2007
@@ -9,6 +9,7 @@
<action name="hello" class="com.opensymphony.xwork2.ActionSupport">
<result name="success">hello.jsp</result>
<result name="tutorial"
type="redirect">/tutorial/test.action</result>
+ <result name="tutorial2"
type="redirect-action">/tutorial/test.action</result>
</action>
</package>
