[utilities COMMIT] /java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/net/URISupport.java

[noreply at shibboleth.net]

Author: scantor
Date: Sun Dec  7 21:52:31 2014
New Revision: 701

URL: http://svn.shibboleth.net/view/utilities?rev=701&view=rev
Log:
Annotations

Modified:
    java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/net/URISupport.java

Modified: java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/net/URISupport.java
URL: http://svn.shibboleth.net/view/utilities/java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/net/URISupport.java?rev=701&r1=700&r2=701&view=diff
==============================================================================
--- java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/net/URISupport.java (original)
+++ java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/net/URISupport.java Sun Dec  7 21:52:31 2014
@@ -25,6 +25,8 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import javax.annotation.Nullable;
+
 import com.google.common.annotations.Beta;
 
 import net.shibboleth.utilities.java.support.collection.LazyList;
@@ -238,7 +240,8 @@
      * @param paramName the URL decoded name of the parameter to find
      * @return the found component, or null if query string or param name is null/empty or the parameter is not found
      */
-    public static String getRawQueryStringParameter(final String queryString, final String paramName) {
+    @Nullable public static String getRawQueryStringParameter(@Nullable final String queryString,
+            @Nullable final String paramName) {
         final String trimmedQuery = trimOrNullQuery(queryString);
         final String trimmedName = StringSupport.trimOrNull(paramName);
         if (trimmedQuery == null || trimmedName == null) {
@@ -247,8 +250,8 @@
 
         final String encodedName = doURLEncode(trimmedName);
         
-        String[] candidates = trimmedQuery.split("&");
-        for (String candidate : candidates) {
+        final String[] candidates = trimmedQuery.split("&");
+        for (final String candidate : candidates) {
             if (candidate.startsWith(encodedName+"=") || candidate.equals(encodedName)) {
                 return candidate;
             }