commit c1b9cf7f2f925315eb1a220bf16916a0d55c40e1
author Cristian Ciocau <cciocau@gmail.com> Mon Oct 17 16:06:24 2016 +0100
committer benwa <btellier@linagora.com> Fri Oct 21 15:12:52 2016 +0200
tree c1f2cc5c50693a1cfa029fc8776daa6b3d8f989a
parent 72fcf89ad5f5f61b45862d09766b001ce37fa6eb

Fix NPE while expanding %{p} (JSPF-99)

resolver/src/main/java/org/apache/james/jspf/core/MacroExpand.java

diff --git a/resolver/src/main/java/org/apache/james/jspf/core/MacroExpand.java b/resolver/src/main/java/org/apache/james/jspf/core/MacroExpand.java
index 8d03b94..6ac2d1e 100644
--- a/resolver/src/main/java/org/apache/james/jspf/core/MacroExpand.java
+++ b/resolver/src/main/java/org/apache/james/jspf/core/MacroExpand.java
@@ -150,6 +150,8 @@
                 // just return the default "unknown".
                 session.setClientDomain("unknown");
             }
+                    
+            session.setClientDomain("unknown");        
             return null;
 
         }
@@ -585,4 +587,4 @@
         return sb.toString();
     }
 
-}
\ No newline at end of file
+}