W-17053925: carbonapi

pdmoineau · pdmoineau · commit d110aeb0920d · 2024-10-24T09:33:52.000-04:00
diff --git a/carbonj.service/src/main/java/com/demandware/carbonj/service/engine/GraphiteSeriesDataServlet.java b/carbonj.service/src/main/java/com/demandware/carbonj/service/engine/GraphiteSeriesDataServlet.java
@@ -98,10 +98,6 @@ protected void doGet( HttpServletRequest req, HttpServletResponse res )
         {
             now = Integer.parseInt( nowText );
         }
-        else if (msgpack)
-        {
-            now = Integer.parseInt( until );
-        }
 
         if( json )
         {
diff --git a/gradle.properties b/gradle.properties
@@ -1,4 +1,4 @@
-version=1.1.63-SNAPSHOT
+version=1.1.63-pmoineau.W-17053925-SNAPSHOT
 org.gradle.jvmargs=--add-opens java.base/java.util=ALL-UNNAMED --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED
 org.gradle.daemon=true
 springbootVersion=3.3.3

Original file line number	Diff line number	Diff line change
`@@ -98,10 +98,6 @@ protected void doGet( HttpServletRequest req, HttpServletResponse res )`
`98`	`98`	`{`
`99`	`99`	`now = Integer.parseInt( nowText );`
`100`	`100`	`}`
`101`		`- else if (msgpack)`
`102`		`- {`
`103`		`- now = Integer.parseInt( until );`
`104`		`- }`
`105`	`101`
`106`	`102`	`if( json )`
`107`	`103`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-version=1.1.63-SNAPSHOT`
	`1`	`+version=1.1.63-pmoineau.W-17053925-SNAPSHOT`
`2`	`2`	`org.gradle.jvmargs=--add-opens java.base/java.util=ALL-UNNAMED --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED`
`3`	`3`	`org.gradle.daemon=true`
`4`	`4`	`springbootVersion=3.3.3`