1 files changed, 3 insertions, 3 deletions
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/LongLiteralExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/LongLiteralExpr.java
index 0db0b9b12..9178c9240 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/LongLiteralExpr.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/LongLiteralExpr.java
@@ -81,13 +81,13 @@ public class LongLiteralExpr extends LiteralStringValueExpr {
         if (lastChar == 'l' || lastChar == 'L') {
             result = result.substring(0, result.length() - 1);
         }
-        if (result.startsWith("0x")) {
+        if (result.startsWith("0x") || result.startsWith("0X")) {
             return Long.parseUnsignedLong(result.substring(2), 16);
         }
-        if (result.startsWith("0b")) {
+        if (result.startsWith("0b") || result.startsWith("0B")) {
             return Long.parseUnsignedLong(result.substring(2), 2);
         }
-        if (result.startsWith("0")) {
+        if (result.length() > 1 && result.startsWith("0")) {
             return Long.parseUnsignedLong(result.substring(1), 8);
         }
         return Long.parseLong(result);