Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

464744 - PathMap.match() never throws IllegalArgumentException

This commit is contained in:
Greg Wilkins 2015-04-21 15:18:47 +10:00
parent 53fdbd2ec0
commit cfb9b3f19b
2 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jetty-http/src/main/java/org/eclipse/jetty/http/PathMap.java
View File

@ -396,10 +396,8 @@ public class PathMap<O> extends HashMap<String,O>
* @param pathSpec the path spec * @param pathSpec the path spec
* @param path the path * @param path the path
* @return true if match. * @return true if match.
* @throws IllegalArgumentException if the matcher experienced a failure
*/ */
public static boolean match(String pathSpec, String path) public static boolean match(String pathSpec, String path)
throws IllegalArgumentException
{ {
return match(pathSpec, path, false); return match(pathSpec, path, false);
} }
@ -410,10 +408,8 @@ public class PathMap<O> extends HashMap<String,O>
* @param path the path * @param path the path
* @param noDefault true to not handle the default path "/" special, false to allow matcher rules to run * @param noDefault true to not handle the default path "/" special, false to allow matcher rules to run
* @return true if match. * @return true if match.
* @throws IllegalArgumentException if matcher experienced a failure
*/ */
public static boolean match(String pathSpec, String path, boolean noDefault) public static boolean match(String pathSpec, String path, boolean noDefault)
throws IllegalArgumentException
{ {
if (pathSpec.length()==0) if (pathSpec.length()==0)
return "/".equals(path); return "/".equals(path);

2
jetty-util/src/main/java/org/eclipse/jetty/util/ssl/ExtendedSslContextFactory.java
View File

@ -21,7 +21,6 @@ package org.eclipse.jetty.util.ssl;
import java.security.KeyStore; import java.security.KeyStore;
import java.security.cert.Certificate; import java.security.cert.Certificate;
import java.security.cert.X509Certificate; import java.security.cert.X509Certificate;
import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
import java.util.Collections; import java.util.Collections;
import java.util.HashMap; import java.util.HashMap;
@ -39,7 +38,6 @@ import javax.net.ssl.SSLParameters;
import javax.net.ssl.StandardConstants; import javax.net.ssl.StandardConstants;
import javax.net.ssl.X509ExtendedKeyManager; import javax.net.ssl.X509ExtendedKeyManager;
import org.eclipse.jetty.util.StringUtil;
import org.eclipse.jetty.util.log.Log; import org.eclipse.jetty.util.log.Log;
import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.log.Logger;