From 188a078b86a27b593707da015f7178e9be7d006b Mon Sep 17 00:00:00 2001 From: olivier lamy Date: Tue, 21 Feb 2017 22:00:07 +1100 Subject: [PATCH] fix issue with path null #9 Signed-off-by: olivier lamy --- .../org/mortbay/jetty/load/generator/profile/Resource.java | 2 +- .../jetty/load/generator/AbstractLoadGeneratorTest.java | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/jetty-load-generator-client/src/main/java/org/mortbay/jetty/load/generator/profile/Resource.java b/jetty-load-generator-client/src/main/java/org/mortbay/jetty/load/generator/profile/Resource.java index 7962aaad..4c81825d 100644 --- a/jetty-load-generator-client/src/main/java/org/mortbay/jetty/load/generator/profile/Resource.java +++ b/jetty-load-generator-client/src/main/java/org/mortbay/jetty/load/generator/profile/Resource.java @@ -99,7 +99,7 @@ public Resource( String path, List then ) public Resource path( String path ) { - this.path = StringUtil.startsWithIgnoreCase( path, "/" ) ? path : "/" + path; + this.path = path !=null ? StringUtil.startsWithIgnoreCase( path, "/" ) ? path : "/" + path : null; return this; } diff --git a/jetty-load-generator-client/src/test/java/org/mortbay/jetty/load/generator/AbstractLoadGeneratorTest.java b/jetty-load-generator-client/src/test/java/org/mortbay/jetty/load/generator/AbstractLoadGeneratorTest.java index 7ecd847f..bfdfbaa2 100644 --- a/jetty-load-generator-client/src/test/java/org/mortbay/jetty/load/generator/AbstractLoadGeneratorTest.java +++ b/jetty-load-generator-client/src/test/java/org/mortbay/jetty/load/generator/AbstractLoadGeneratorTest.java @@ -295,6 +295,11 @@ private Collection paths( Resource profile ) { Set paths = new HashSet<>(); + if (profile.getPath() != null) + { + paths.add( profile.getPath() ); + } + for ( Resource resource : profile.getResources() ) { paths.addAll( paths( resource ) );