Merge commit '9d8ee801'

core/src/main/java/hudson/model/AbstractItem.java

@@ -403,7 +403,7 @@ public abstract class AbstractItem extends Actionable implements Item, HttpDelet
     public String getShortUrl() {
         String prefix = getParent().getUrlChildPrefix();
         String subdir = Util.rawEncode(getName());
-        return prefix.equals(".") ? subdir : prefix+'/'+subdir+'/';
+        return prefix.equals(".") ? subdir + '/' : prefix + '/' + subdir + '/';
     }
 
     public String getSearchUrl() {

test/src/test/java/hudson/matrix/MatrixTest.java

@@ -44,9 +44,7 @@ public class MatrixTest extends HudsonTestCase {
         MatrixProject mp = new MatrixProject("matrix test");
         MatrixConfiguration mc = new MatrixConfiguration(mp, Combination.fromString("foo bar=baz bat"));
         assertEquals("job/matrix%20test/", mp.getUrl());
-        assertTrue("Invalid: " + mc.getUrl(),
-                   "job/matrix%20test/foo%20bar=baz%20bat/".equals(mc.getUrl())
-                   || "job/matrix%20test/./foo%20bar=baz%20bat/".equals(mc.getUrl()));
+        assertEquals("job/matrix%20test/foo%20bar=baz%20bat/", mc.getUrl());
     }
     
     /**