Repository: james-jspf
Updated Branches:
refs/heads/master 72fcf89ad -> 4da8fbba1
Fix NPE while expanding %{p} (JSPF-99)
Project: http://git-wip-us.apache.org/repos/asf/james-jspf/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-jspf/commit/c1b9cf7f
Tree: http://git-wip-us.apache.org/repos/asf/james-jspf/tree/c1b9cf7f
Diff: http://git-wip-us.apache.org/repos/asf/james-jspf/diff/c1b9cf7f
Branch: refs/heads/master
Commit: c1b9cf7f2f925315eb1a220bf16916a0d55c40e1
Parents: 72fcf89
Author: Cristian Ciocau <[email protected]>
Authored: Mon Oct 17 16:06:24 2016 +0100
Committer: benwa <[email protected]>
Committed: Fri Oct 21 15:12:52 2016 +0200
----------------------------------------------------------------------
.../src/main/java/org/apache/james/jspf/core/MacroExpand.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-jspf/blob/c1b9cf7f/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 @@ public class MacroExpand {
// just return the default "unknown".
session.setClientDomain("unknown");
}
+
+ session.setClientDomain("unknown");
return null;
}
@@ -585,4 +587,4 @@ public class MacroExpand {
return sb.toString();
}
-}
\ No newline at end of file
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]