abdera-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jmsn...@apache.org
Subject svn commit: r615420 - /incubator/abdera/java/branches/server_refactor_all/server/src/main/java/org/apache/abdera/protocol/server/impl/TemplateTargetBuilder.java
Date Sat, 26 Jan 2008 01:32:43 GMT
Author: jmsnell
Date: Fri Jan 25 17:32:42 2008
New Revision: 615420

URL: http://svn.apache.org/viewvc?rev=615420&view=rev
Log:
deal with null input param

Modified:
    incubator/abdera/java/branches/server_refactor_all/server/src/main/java/org/apache/abdera/protocol/server/impl/TemplateTargetBuilder.java

Modified: incubator/abdera/java/branches/server_refactor_all/server/src/main/java/org/apache/abdera/protocol/server/impl/TemplateTargetBuilder.java
URL: http://svn.apache.org/viewvc/incubator/abdera/java/branches/server_refactor_all/server/src/main/java/org/apache/abdera/protocol/server/impl/TemplateTargetBuilder.java?rev=615420&r1=615419&r2=615420&view=diff
==============================================================================
--- incubator/abdera/java/branches/server_refactor_all/server/src/main/java/org/apache/abdera/protocol/server/impl/TemplateTargetBuilder.java
(original)
+++ incubator/abdera/java/branches/server_refactor_all/server/src/main/java/org/apache/abdera/protocol/server/impl/TemplateTargetBuilder.java
Fri Jan 25 17:32:42 2008
@@ -94,7 +94,7 @@
       String var) {
         Variable variable = Variable.get(var);
         if (variable == null) 
-          return (T)subcontext.resolve(var);
+          return subcontext != null ? (T)subcontext.resolve(var) : null;
         switch(variable) {
           case REQUEST_URI:
             return (T) request.getUri().toString();
@@ -133,7 +133,7 @@
           case TARGET_BASE:
             return (T) request.getTargetBasePath();
           default: 
-            return (T)subcontext.resolve(var);
+            return subcontext != null ? (T)subcontext.resolve(var) : null;
         }
     }
 



Mime
View raw message