NPE fix

yacy · Dec 22, 2014 · bef689d · bef689d
1 parent 5d321d3
commit bef689d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/htroot/ConfigPortal.java b/htroot/ConfigPortal.java
@@ -219,7 +219,7 @@ public static serverObjects respond(final RequestHeader header, final serverObje
         prop.put("target_selected_special_searchresult", "searchresult".equals(target_special) ? 1 : 0);
         prop.put("target_special_pattern", sb.getConfig(SwitchboardConstants.SEARCH_TARGET_SPECIAL_PATTERN, ""));
 
-        String myaddress = (sb.peers == null) ? null : sb.peers.mySeed() == null ? null : sb.peers.mySeed().getPublicAddress(sb.peers.mySeed().getIP());
+        String myaddress = (sb.peers == null) || sb.peers.mySeed() == null || sb.peers.mySeed().getIP() == null ? null : sb.peers.mySeed().getPublicAddress(sb.peers.mySeed().getIP());
         if (myaddress == null) {
             myaddress = "localhost:" + sb.getLocalPort("port", 8090);
         }

diff --git a/htroot/ViewLog_p.java b/htroot/ViewLog_p.java
@@ -102,6 +102,7 @@ public static serverObjects respond(@SuppressWarnings("unused") final RequestHea
         int level = 0;
         int lc = 0;
         for (final String logLine : log) {
+            if (logLine == null) break;
             final String nextLogLine = logLine.trim();
 
             if (filterMatcher != null) {