commit c2615d5fbd4b08ab6ffe7932a6cb29580d89586d
author Greg Wilkins <gregw@webtide.com> Sun Jul 12 21:33:15 2015 +1000
committer Greg Wilkins <gregw@webtide.com> Sun Jul 12 21:33:15 2015 +1000
tree b0084a34f689f9225596f418677077bc314ef75e
parent 2c3326e049dc916db5add2bcd0a04293ee23d999

472411 - PathResource.checkAliasPath typo

jetty-server/src/main/java/org/eclipse/jetty/server/handler/AllowSymLinkAliasChecker.java

diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/AllowSymLinkAliasChecker.java b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/AllowSymLinkAliasChecker.java
index ea25f47..f6dad19 100644
--- a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/AllowSymLinkAliasChecker.java
+++ b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/AllowSymLinkAliasChecker.java
@@ -52,8 +52,6 @@
         {
             Path path = pathResource.getPath();
             Path alias = pathResource.getAliasPath();
-            System.err.printf("getPath=%s%n",path);
-            System.err.printf("getAliasPath=%s%n",alias);
             
             // is the file itself a symlink?
             if (Files.isSymbolicLink(path))

jetty-util/src/main/java/org/eclipse/jetty/util/resource/PathResource.java

diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/resource/PathResource.java b/jetty-util/src/main/java/org/eclipse/jetty/util/resource/PathResource.java
index 10f0b92..35e7ee0 100644
--- a/jetty-util/src/main/java/org/eclipse/jetty/util/resource/PathResource.java
+++ b/jetty-util/src/main/java/org/eclipse/jetty/util/resource/PathResource.java
@@ -107,7 +107,7 @@
                  */
                 
                 int absCount = abs.getNameCount();
-                int realCount = abs.getNameCount();
+                int realCount = real.getNameCount();
                 if (absCount != realCount)
                 {
                     // different number of segments