Author: julien_viet
Date: 2010-09-01 13:38:44 -0400 (Wed, 01 Sep 2010)
New Revision: 4020
Modified:
portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/controller/router/Route.java
Log:
minor
Modified:
portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/controller/router/Route.java
===================================================================
---
portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/controller/router/Route.java 2010-09-01
17:14:17 UTC (rev 4019)
+++
portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/controller/router/Route.java 2010-09-01
17:38:44 UTC (rev 4020)
@@ -145,15 +145,19 @@
{
String path = context.getPath();
+ ProcessResponse ret = null;
+
// Anything that does not begin with '/' returns null
if (path.length() > 0 && path.charAt(0) == '/')
{
+
+
// The '/' means the current controller if any, otherwise it may be
processed by the pattern matching
if (path.length() == 1)
{
if (controllerRef != null)
{
- return new ProcessResponse(controllerRef, context.getPath(),
context.getParameters());
+ ret = new ProcessResponse(controllerRef, context.getPath(),
context.getParameters());
}
}
else
@@ -201,7 +205,7 @@
// If we do have a response we return it
if (response != null)
{
- return response;
+ ret = response;
}
}
}
@@ -245,14 +249,15 @@
// If we do have a response we return it
if (response != null)
{
- return response;
+ ret = response;
+ break;
}
}
}
}
//
- return null;
+ return ret;
}
/** . */
Show replies by date