diff options
| -rwxr-xr-x | sources/scala/tools/scaladoc/HTTPServer.java | 3 | ||||
| -rw-r--r-- | sources/scala/tools/scaladoc/ScalaSearch.java | 13 |
2 files changed, 12 insertions, 4 deletions
diff --git a/sources/scala/tools/scaladoc/HTTPServer.java b/sources/scala/tools/scaladoc/HTTPServer.java index 6c91c6de4c..a46bc7acb6 100755 --- a/sources/scala/tools/scaladoc/HTTPServer.java +++ b/sources/scala/tools/scaladoc/HTTPServer.java @@ -123,6 +123,9 @@ public class HTTPServer extends Thread { while (true) { try { Socket request = server.accept(); + InetSocketAddress addr = (InetSocketAddress) request.getRemoteSocketAddress(); + if (addr != null) + System.out.println("Connection from: " + addr.getAddress().getCanonicalHostName()); RequestProcessor.processRequest(request); } catch (IOException e) { diff --git a/sources/scala/tools/scaladoc/ScalaSearch.java b/sources/scala/tools/scaladoc/ScalaSearch.java index 96f3d5e174..6dced243fc 100644 --- a/sources/scala/tools/scaladoc/ScalaSearch.java +++ b/sources/scala/tools/scaladoc/ScalaSearch.java @@ -515,10 +515,15 @@ public class ScalaSearch { //////////////////////////// OVERRIDEN SYMBOL ////////////////////////////// public static Symbol overridenBySymbol(Symbol sym) { - Type base = Type.compoundTypeWithOwner(sym.owner(), - sym.owner().info().parents(), - Scope.EMPTY); - return sym.overriddenSymbol(base); + Symbol owner = sym.owner(); + if (owner.isRoot() || owner.isPackageClass()) + return Symbol.NONE; + else { + Type base = Type.compoundTypeWithOwner(owner, + sym.owner().info().parents(), + Scope.EMPTY); + return sym.overriddenSymbol(base); + } } ////////////////////////// POST TYPECHECKING //////////////////////// |