Simplify

markt-asf · markt-asf · commit 2a2476460e82 · 2026-05-01T11:11:24.000+01:00
diff --git a/java/org/apache/coyote/http2/HPackHuffman.java b/java/org/apache/coyote/http2/HPackHuffman.java
@@ -490,16 +490,9 @@ public static void decode(ByteBuffer data, int length, StringBuilder target, boo
         if (!eosBits) {
             throw new HpackException(sm.getString("hpackhuffman.huffmanEncodedHpackValueDidNotEndWithEOS"));
         }
-        if (isFieldName) {
-            if (!HttpParser.isToken(c) || Character.isUpperCase(c)) {
-                throw new IllegalArgumentException(sm
-                        .getString("hpackhuffman.decode.illegalCharacterName", Character.toString(c)));
-            }
-        } else {
-            if (!HttpParser.isFieldVChar(c)) {
-                throw new IllegalArgumentException(
-                        sm.getString("hpackhuffman.decode.illegalCharacterValue.end", Character.toString(c)));
-            }
+        if (!isFieldName && !HttpParser.isFieldVChar(c)) {
+            throw new IllegalArgumentException(
+                    sm.getString("hpackhuffman.decode.illegalCharacterValue.end", Character.toString(c)));
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -490,16 +490,9 @@ public static void decode(ByteBuffer data, int length, StringBuilder target, boo`
`490`	`490`	`if (!eosBits) {`
`491`	`491`	`throw new HpackException(sm.getString("hpackhuffman.huffmanEncodedHpackValueDidNotEndWithEOS"));`
`492`	`492`	`}`
`493`		`- if (isFieldName) {`
`494`		`- if (!HttpParser.isToken(c) \|\| Character.isUpperCase(c)) {`
`495`		`- throw new IllegalArgumentException(sm`
`496`		`- .getString("hpackhuffman.decode.illegalCharacterName", Character.toString(c)));`
`497`		`- }`
`498`		`- } else {`
`499`		`- if (!HttpParser.isFieldVChar(c)) {`
`500`		`- throw new IllegalArgumentException(`
`501`		`- sm.getString("hpackhuffman.decode.illegalCharacterValue.end", Character.toString(c)));`
`502`		`- }`
	`493`	`+ if (!isFieldName && !HttpParser.isFieldVChar(c)) {`
	`494`	`+ throw new IllegalArgumentException(`
	`495`	`+ sm.getString("hpackhuffman.decode.illegalCharacterValue.end", Character.toString(c)));`
`503`	`496`	`}`
`504`	`497`	`}`
`505`	`498`