Merge remote-tracking branch 'origin/master' into jetty-9.1

Conflicts:
	jetty-start/src/main/java/org/eclipse/jetty/start/Main.java
	jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebAppContext.java

4 files changed, 6 insertions, 5 deletions

diff --git a/jetty-http/src/main/java/org/eclipse/jetty/http/HttpField.java b/jetty-http/src/main/java/org/eclipse/jetty/http/HttpField.java
index 6d835dc2d5..8241d1d62f 100644
--- a/jetty-http/src/main/java/org/eclipse/jetty/http/HttpField.java
+++ b/jetty-http/src/main/java/org/eclipse/jetty/http/HttpField.java
@@ -231,7 +231,7 @@ public class HttpField
     public String toString()
     {
         String v=getValue();
-        return getName() + ": " + (v==null?"":v.toString());
+        return getName() + ": " + (v==null?"":v);
     }
 
     public boolean isSame(HttpField field)
diff --git a/jetty-http/src/main/java/org/eclipse/jetty/http/HttpFields.java b/jetty-http/src/main/java/org/eclipse/jetty/http/HttpFields.java
index c8f3b4f23e..41316562e1 100644
--- a/jetty-http/src/main/java/org/eclipse/jetty/http/HttpFields.java
+++ b/jetty-http/src/main/java/org/eclipse/jetty/http/HttpFields.java
@@ -900,7 +900,7 @@ public class HttpFields implements Iterable<HttpField>
             HttpField field=i.next();
             if (field.getHeader()==HttpHeader.SET_COOKIE)
             {
-                String val = (field.getValue() == null ? null : field.getValue().toString());
+                String val = field.getValue();
                 if (val!=null && val.startsWith(name_equals))
                 {
                     //existing cookie has same name, does it also match domain and path?
diff --git a/jetty-http/src/main/java/org/eclipse/jetty/http/MimeTypes.java b/jetty-http/src/main/java/org/eclipse/jetty/http/MimeTypes.java
index 5bd40b22d7..311a68827e 100644
--- a/jetty-http/src/main/java/org/eclipse/jetty/http/MimeTypes.java
+++ b/jetty-http/src/main/java/org/eclipse/jetty/http/MimeTypes.java
@@ -25,6 +25,7 @@ import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Locale;
 import java.util.Map;
+import java.util.Map.Entry;
 import java.util.MissingResourceException;
 import java.util.ResourceBundle;
 import java.util.Set;
@@ -192,8 +193,8 @@ public class MimeTypes
         _mimeMap.clear();
         if (mimeMap!=null)
         {
-            for (String ext : mimeMap.keySet())
-                _mimeMap.put(StringUtil.asciiToLowerCase(ext),normalizeMimeType(mimeMap.get(ext)));
+            for (Entry<String, String> ext : mimeMap.entrySet())
+                _mimeMap.put(StringUtil.asciiToLowerCase(ext.getKey()),normalizeMimeType(ext.getValue()));
         }
     }
     
diff --git a/jetty-http/src/test/java/org/eclipse/jetty/http/HttpParserTest.java b/jetty-http/src/test/java/org/eclipse/jetty/http/HttpParserTest.java
index f59f75182c..d3d77b3e42 100644
--- a/jetty-http/src/test/java/org/eclipse/jetty/http/HttpParserTest.java
+++ b/jetty-http/src/test/java/org/eclipse/jetty/http/HttpParserTest.java
@@ -1427,7 +1427,7 @@ public class HttpParserTest
             _fields.clear();
             _methodOrVersion = version.asString();
             _uriOrStatus = Integer.toString(status);
-            _versionOrReason = reason==null?null:reason.toString();
+            _versionOrReason = reason;
 
             fields=new HttpFields();
             _hdr= new String[9];