Merge remote-tracking branch 'upstream/master'

Author: Grégoire Juge

modules/org.restlet.ext.oauth/src/org/restlet/ext/oauth/OAuthParameters.java

@@ -29,6 +29,7 @@
 import java.util.logging.Logger;
 
 import org.restlet.data.Form;
+import org.restlet.data.Parameter;
 import org.restlet.data.Reference;
 import org.restlet.ext.oauth.internal.Scopes;
 import org.restlet.representation.Representation;
@@ -118,6 +119,17 @@ public Reference toReference(String uri) {
         reference.setQuery(query);
         return reference;
     }
+    
+    public Reference toReference(Reference ref) {
+    	Reference reference = new Reference(ref);
+        
+        //Add each parameter to avoid overwriting existing parameters
+        for(Parameter param : form){
+        	reference.addQueryParameter(param);
+        }
+        
+        return reference;
+    }
 
     public Representation toRepresentation() {
         return form.getWebRepresentation();

modules/org.restlet.ext.servlet/src/org/restlet/ext/servlet/internal/ServletServerAdapter.java

@@ -85,8 +85,10 @@ public HttpRequest toRequest(ServerCall httpCall) {
             for (final Enumeration<String> namesEnum = servletCall.getRequest()
                     .getAttributeNames(); namesEnum.hasMoreElements();) {
                 attributeName = namesEnum.nextElement();
-                result.getAttributes().put(attributeName,
-                        servletCall.getRequest().getAttribute(attributeName));
+                Object attribute = servletCall.getRequest().getAttribute(attributeName);
+                if (attribute != null) {
+                    result.getAttributes().put(attributeName, attribute);
+                }
             }
         }
 

modules/org.restlet.test/src/org/restlet/test/ext/oauth/OAuthParametersTest.java

@@ -64,4 +64,16 @@ public void testToReference() {
         assertEquals("val2", form.getFirstValue("bar"));
         assertEquals("val3", form.getFirstValue("buz"));
     }
+    
+    @Test
+    public void testToReferenceFromReference() {
+    	Reference originalReference = new Reference("http://localhost/test?existing=thing");
+    	
+        Reference reference = parameters.toReference(originalReference);
+        Form form = reference.getQueryAsForm();
+        assertEquals("thing", form.getFirstValue("existing"));
+        assertEquals("val1", form.getFirstValue("foo"));
+        assertEquals("val2", form.getFirstValue("bar"));
+        assertEquals("val3", form.getFirstValue("buz"));
+    }
 }