[olingo-odata4] branch master updated: [OLINGO-1191]Fix null issue in Edm.String

[ramyav]

This is an automated email from the ASF dual-hosted git repository.

ramyav pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/olingo-odata4.git


The following commit(s) were added to refs/heads/master by this push:
     new 4baf2b6  [OLINGO-1191]Fix null issue in Edm.String
4baf2b6 is described below

commit 4baf2b695ae4d031cb0c50c7c75ff87d2757ff1b
Author: ramya vasanth <ramya.vasa...@sap.com>
AuthorDate: Fri Oct 9 14:13:31 2020 +0530

    [OLINGO-1191]Fix null issue in Edm.String
---
 .../org/apache/olingo/commons/core/edm/primitivetype/EdmString.java  | 5 ++++-
 .../apache/olingo/commons/core/edm/primitivetype/EdmStringTest.java  | 1 +
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git 
a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmString.java
 
b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmString.java
index 8e9a42a..29b44b4 100644
--- 
a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmString.java
+++ 
b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmString.java
@@ -99,7 +99,10 @@ public final class EdmString extends SingletonPrimitiveType {
   }
 
   @Override
-  public String fromUriLiteral(final String literal) throws 
EdmPrimitiveTypeException {
+  public String fromUriLiteral(String literal) throws 
EdmPrimitiveTypeException {
+         if (literal != null && literal.equalsIgnoreCase("null")) {
+                 literal = "'" + literal + "'";
+         }
     return literal == null ? null : 
super.fromUriLiteral(literal).replace("''", "'");
   }
 }
diff --git 
a/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmStringTest.java
 
b/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmStringTest.java
index b5f2a89..68b5820 100644
--- 
a/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmStringTest.java
+++ 
b/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmStringTest.java
@@ -38,6 +38,7 @@ public class EdmStringTest extends PrimitiveTypeBaseTest {
   @Test
   public void fromUriLiteral() throws Exception {
     assertEquals("String''Value", 
instance.fromUriLiteral("'String''''Value'"));
+    assertEquals("null", instance.fromUriLiteral("null"));
 
     expectErrorInFromUriLiteral(instance, "");
     expectErrorInFromUriLiteral(instance, "'");