changeset 52766:59bd83783308 amber-demo

manual merge with patterns
author vromero
date Sun, 07 Oct 2018 10:19:26 -0700
parents 16ef25fac6d1 2d12bf1331f9
children 100f5811cd57
files src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavacParser.java
diffstat 1 files changed, 2 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavacParser.java	Sun Oct 07 09:00:55 2018 -0700
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavacParser.java	Sun Oct 07 10:19:26 2018 -0700
@@ -4185,6 +4185,8 @@
                 if (token.kind == DEFAULT) {
                     accept(DEFAULT);
                     defaultValue = annotationValue();
+                } else {
+                    defaultValue = null;
                 }
                 accept(SEMI);
                 if (token.pos <= endPosTable.errorEndPos) {