RESTEASY-1019: fixed parsing of a weak EntityTag

ja-fra · Feb 19, 2014 · a1f44f0 · a1f44f0
1 parent 3ddbc5b
commit a1f44f0
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/.../resteasy-jaxrs/src/main/java/org/jboss/resteasy/plugins/delegates/EntityTagDelegate.java b/.../resteasy-jaxrs/src/main/java/org/jboss/resteasy/plugins/delegates/EntityTagDelegate.java
@@ -12,6 +12,12 @@ public class EntityTagDelegate implements RuntimeDelegate.HeaderDelegate<EntityT
    public EntityTag fromString(String value) throws IllegalArgumentException
    {
       if (value == null) throw new IllegalArgumentException("value of EntityTag is null");
+      boolean weakTag = false;
+      if (value.startsWith("W/"))
+      {
+         weakTag = true;
+         value = value.substring(2);
+      }
       if (value.startsWith("\""))
       {
          value = value.substring(1);
@@ -20,11 +26,7 @@ public EntityTag fromString(String value) throws IllegalArgumentException
       {
          value = value.substring(0, value.length() - 1);
       }
-      if (value.startsWith("W/"))
+      return new EntityTag(value, weakTag);
-      {
-         return new EntityTag(value.substring(2), true);
-      }
-      return new EntityTag(value);
    }
 
    public String toString(EntityTag value)