You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beehive.apache.org by cr...@apache.org on 2006/01/08 19:15:01 UTC
svn commit: r367062 - in /beehive/trunk/netui:
src/pageflow/org/apache/beehive/netui/pageflow/PageFlowUtils.java
test/webapps/drt/testRecorder/tests/PageFlowUtils.xml
test/webapps/drt/web/miniTests/pageFlowUtils/index.jsp
Author: crogers
Date: Sun Jan 8 10:14:52 2006
New Revision: 367062
URL: http://svn.apache.org/viewcvs?rev=367062&view=rev
Log:
Fix for https://issues.apache.org/jira/browse/BEEHIVE-1035 - NPE in PageFlowUtils.getModulePathForRelativeURI()
tests: drt, bvt in netui (WinXP)
Modified:
beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowUtils.java
beehive/trunk/netui/test/webapps/drt/testRecorder/tests/PageFlowUtils.xml
beehive/trunk/netui/test/webapps/drt/web/miniTests/pageFlowUtils/index.jsp
Modified: beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowUtils.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowUtils.java?rev=367062&r1=367061&r2=367062&view=diff
==============================================================================
--- beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowUtils.java (original)
+++ beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowUtils.java Sun Jan 8 10:14:52 2006
@@ -118,6 +118,7 @@
*/
public static String getModulePathForRelativeURI( String uri )
{
+ if ( uri == null ) return null;
assert uri.length() > 0;
assert uri.charAt( 0 ) == '/' : uri;
Modified: beehive/trunk/netui/test/webapps/drt/testRecorder/tests/PageFlowUtils.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/PageFlowUtils.xml?rev=367062&r1=367061&r2=367062&view=diff
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/testRecorder/tests/PageFlowUtils.xml (original)
+++ beehive/trunk/netui/test/webapps/drt/testRecorder/tests/PageFlowUtils.xml Sun Jan 8 10:14:52 2006
@@ -97,6 +97,9 @@
<code>getRelativeURI( request, "/coreWeb/miniTests/pageFlowUtils/foo.jsp", curJPF )</code>:
/foo.jsp<br>
+ <code>getModulePathForRelativeURI( null )</code>:
+ null<br>
+
<code>getBeginActionURI( "/coreWeb/miniTests/pageFlowUtils/pageFlowUtilsController.jpf" )</code>:
/coreWeb/miniTests/pageFlowUtils/begin.do<br>
@@ -411,6 +414,9 @@
<code>getRelativeURI( request, "/coreWeb/miniTests/pageFlowUtils/foo.jsp", curJPF )</code>:
/foo.jsp<br>
+ <code>getModulePathForRelativeURI( null )</code>:
+ null<br>
+
<code>getBeginActionURI( "/coreWeb/miniTests/pageFlowUtils/pageFlowUtilsController.jpf" )</code>:
/coreWeb/miniTests/pageFlowUtils/begin.do<br>
Modified: beehive/trunk/netui/test/webapps/drt/web/miniTests/pageFlowUtils/index.jsp
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/drt/web/miniTests/pageFlowUtils/index.jsp?rev=367062&r1=367061&r2=367062&view=diff
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/web/miniTests/pageFlowUtils/index.jsp (original)
+++ beehive/trunk/netui/test/webapps/drt/web/miniTests/pageFlowUtils/index.jsp Sun Jan 8 10:14:52 2006
@@ -38,6 +38,9 @@
<code>getRelativeURI( request, "/coreWeb/miniTests/pageFlowUtils/foo.jsp", curJPF )</code>:
<%= PageFlowUtils.getRelativeURI( request, "/coreWeb/miniTests/pageFlowUtils/foo.jsp", curJpf ) %><br>
+ <code>getModulePathForRelativeURI( null )</code>:
+ <%= PageFlowUtils.getModulePathForRelativeURI( null ) %><br>
+
<code>getBeginActionURI( "/coreWeb/miniTests/pageFlowUtils/pageFlowUtilsController.jpf" )</code>:
<%= PageFlowUtils.getBeginActionURI( "/coreWeb/miniTests/pageFlowUtils/pageFlowUtilsController.jpf" ) %><br>