From fd72e5287b7f1b0094429aeea44b8fc2cf436a16 Mon Sep 17 00:00:00 2001
From: Zac Spitzer <zac.spitzer@gmail.com>
Date: Thu, 1 Apr 2021 18:29:49 +0200
Subject: [PATCH] 6.0.0.81 back out invalid json change LDEV-1503

---
 .../lucee/runtime/interpreter/CFMLExpressionInterpreter.java   | 3 ++-
 loader/build.xml                                               | 2 +-
 loader/pom.xml                                                 | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/core/src/main/java/lucee/runtime/interpreter/CFMLExpressionInterpreter.java b/core/src/main/java/lucee/runtime/interpreter/CFMLExpressionInterpreter.java
index 96ea3c5316..e30ebb6b56 100755
--- a/core/src/main/java/lucee/runtime/interpreter/CFMLExpressionInterpreter.java
+++ b/core/src/main/java/lucee/runtime/interpreter/CFMLExpressionInterpreter.java
@@ -1019,7 +1019,7 @@ else if ((str.length() - pos) <= 10) {
 
 	protected Ref json(FunctionLibFunction flf, char start, char end) throws PageException {
 		if (!cfml.isCurrent(start)) return null;
-
+		/*
 		String[] str = cfml.toString().split(",");
 		if(cfml.getCurrent() == '{' && cfml.getNext() != '}' && str.length >1) {
 			outer:for(int i=0; i<str.length; i++) {
@@ -1035,6 +1035,7 @@ else if(strsplit[0].charAt(0) != '"' || (strsplit[1].charAt(0) != '"' && !Charac
 				}
 			}
 		}
+		*/
 
 		if (cfml.forwardIfCurrent('[', ':', ']') || cfml.forwardIfCurrent('[', '=', ']')) {
 			return new BIFCall(LITERAL_ORDERED_STRUCT, new Ref[0]);
diff --git a/loader/build.xml b/loader/build.xml
index e1d53216d9..f410fbe001 100644
--- a/loader/build.xml
+++ b/loader/build.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project default="core" basedir="." name="Lucee" xmlns:artifact="antlib:org.apache.maven.artifact.ant">
 
-  <property name="version" value="6.0.0.80-SNAPSHOT"/>
+  <property name="version" value="6.0.0.81-SNAPSHOT"/>
 
   <path id="maven-ant-tasks.classpath" path="../ant/lib/maven-ant-tasks-2.1.3.jar" />
   <typedef resource="org/apache/maven/artifact/ant/antlib.xml"
diff --git a/loader/pom.xml b/loader/pom.xml
index b97642d9e5..4fecf1f86a 100644
--- a/loader/pom.xml
+++ b/loader/pom.xml
@@ -3,7 +3,7 @@
 
   <groupId>org.lucee</groupId>
   <artifactId>lucee</artifactId>
-  <version>6.0.0.80-SNAPSHOT</version>
+  <version>6.0.0.81-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>Lucee Loader Build</name>