[gatein-commits] gatein SVN: r5427 - in portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web: controller/router and 1 other directory.

Author: julien_viet Date: 2010-12-01 12:13:39 -0500 (Wed, 01 Dec 2010) New Revision: 5427 Modified: portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/WebAppController.java portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/controller/router/Route.java Log: - fix NPE - print router during web app controller startup Modified: portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/WebAppController.java =================================================================== --- portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/WebAppController.java 2010-12-01 16:46:44 UTC (rev 5426) +++ portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/WebAppController.java 2010-12-01 17:13:39 UTC (rev 5427) @@ -102,6 +102,9 @@ Router router = new Router(routerDesc); // + System.out.println("router = " + router); + + // this.applications_ = new HashMap<String, Application>(); this.attributes_ = new HashMap<String, Object>(); this.handlers = new HashMap<String, WebRequestHandler>(); 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-12-01 16:46:44 UTC (rev 5426) +++ portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/controller/router/Route.java 2010-12-01 17:13:39 UTC (rev 5427) @@ -104,7 +104,10 @@ writer.writeStartElement("request-param"); writer.writeAttribute("qname", requestParam.name.getValue()); writer.writeAttribute("name", requestParam.matchName); - writer.writeAttribute("value", requestParam.matchValue.pattern()); + if (requestParam.matchValue != null) + { + writer.writeAttribute("value", requestParam.matchValue.pattern()); + } writer.writeEndElement(); }