fix possible NullPointerException

1 files changed, 7 insertions, 4 deletions

diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/logging/IaikLogFactory.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/logging/IaikLogFactory.java
index cca9117..74491d8 100644
--- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/logging/IaikLogFactory.java
+++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/logging/IaikLogFactory.java
@@ -24,6 +24,7 @@
 
 package at.gv.egovernment.moa.spss.server.logging;
 
+import at.gv.egovernment.moaspss.logging.LoggingContext;
 import at.gv.egovernment.moaspss.logging.LoggingContextManager;
 import iaik.logging.Log;
 import iaik.logging.LogConfigurationException;
@@ -52,10 +53,12 @@ public class IaikLogFactory extends LogFactory {
    * @return The <code>iaik.logging.Log</code> object to log messages to.
    */  
   private Log getInstanceImpl() {
-    String nodeID = 
-      LoggingContextManager.getInstance().getLoggingContext().getNodeID();
-      
-    return new IaikLog(nodeID);
+	  LoggingContext context = LoggingContextManager.getInstance().getLoggingContext();
+	  if (context != null)
+		  return new IaikLog(context.getNodeID());
+	  else
+		  return new IaikLog("Internal");
+	            
   }
 
   public void release() {