You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pivot.apache.org by gb...@apache.org on 2010/03/06 16:27:17 UTC
svn commit: r919785 -
/pivot/trunk/web-server/src/org/apache/pivot/web/server/QueryServlet.java
Author: gbrown
Date: Sat Mar 6 15:27:16 2010
New Revision: 919785
URL: http://svn.apache.org/viewvc?rev=919785&view=rev
Log:
Fix NPE in QueryServlet.
Modified:
pivot/trunk/web-server/src/org/apache/pivot/web/server/QueryServlet.java
Modified: pivot/trunk/web-server/src/org/apache/pivot/web/server/QueryServlet.java
URL: http://svn.apache.org/viewvc/pivot/trunk/web-server/src/org/apache/pivot/web/server/QueryServlet.java?rev=919785&r1=919784&r2=919785&view=diff
==============================================================================
--- pivot/trunk/web-server/src/org/apache/pivot/web/server/QueryServlet.java (original)
+++ pivot/trunk/web-server/src/org/apache/pivot/web/server/QueryServlet.java Sat Mar 6 15:27:16 2010
@@ -571,7 +571,14 @@
private Path getPath(HttpServletRequest request) {
String pathInfo = request.getPathInfo();
- Path path = (pathInfo.length() == 0) ? new Path() : new Path(pathInfo.substring(1).split("/"));
+ Path path;
+ if (pathInfo == null
+ || pathInfo.length() == 0) {
+ path = new Path();
+ } else {
+ path = new Path(pathInfo.substring(1).split("/"));
+ }
+
return path;
}