You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by mi...@apache.org on 2014/03/16 10:06:32 UTC
[43/50] [abbrv] git commit: [OLINGO-179] fix3
[OLINGO-179] fix3
Project: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/commit/62b87a05
Tree: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/tree/62b87a05
Diff: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/diff/62b87a05
Branch: refs/heads/Olingo-129_PocJpaDataStore
Commit: 62b87a05fde2d5012605841acbf8790f3834557c
Parents: e164046
Author: Stephan Klevenz <sk...@apache.org>
Authored: Thu Feb 27 12:13:04 2014 +0100
Committer: Stephan Klevenz <sk...@apache.org>
Committed: Thu Feb 27 12:13:04 2014 +0100
----------------------------------------------------------------------
.../src/main/java/org/apache/olingo/odata2/core/edm/EdmDouble.java | 2 +-
.../src/main/java/org/apache/olingo/odata2/core/edm/EdmSingle.java | 2 +-
.../org/apache/olingo/odata2/core/edm/EdmSimpleTypeFacadeTest.java | 2 --
3 files changed, 2 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/62b87a05/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmDouble.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmDouble.java b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmDouble.java
index cac1f19..0aaae45 100644
--- a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmDouble.java
+++ b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmDouble.java
@@ -40,7 +40,7 @@ public class EdmDouble extends AbstractSimpleType {
private static final Pattern PATTERN = Pattern.compile(
- "(?:\\+|-)?\\p{Digit}{1,16}(?:\\.\\p{Digit}{1,16})?(?:(?:E|e)(?:\\+|-)?\\p{Digit}{1,3})?(D|d)?");
+ "(?:\\+|-)?\\p{Digit}+(?:\\.\\p{Digit}+)?(?:(?:E|e)(?:\\+|-)?\\p{Digit}{1,3})?(D|d)?");
private static final EdmDouble instance = new EdmDouble();
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/62b87a05/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmSingle.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmSingle.java b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmSingle.java
index a17d061..9c27fd2 100644
--- a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmSingle.java
+++ b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmSingle.java
@@ -39,7 +39,7 @@ public class EdmSingle extends AbstractSimpleType {
private static final int MAX_SCALE = 38;
private static final Pattern PATTERN = Pattern.compile(
- "(?:\\+|-)?\\p{Digit}{1,8}(?:\\.\\p{Digit}{1,8})?(?:(?:E|e)(?:\\+|-)?\\p{Digit}{1,2})?(F|f)?");
+ "(?:\\+|-)?\\p{Digit}+(?:\\.\\p{Digit}+)?(?:(?:E|e)(?:\\+|-)?\\p{Digit}{1,2})?(F|f)?");
private static final EdmSingle instance = new EdmSingle();
public static EdmSingle getInstance() {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/62b87a05/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/EdmSimpleTypeFacadeTest.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/EdmSimpleTypeFacadeTest.java b/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/EdmSimpleTypeFacadeTest.java
index 39912ee..0294c5b 100644
--- a/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/EdmSimpleTypeFacadeTest.java
+++ b/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/EdmSimpleTypeFacadeTest.java
@@ -354,8 +354,6 @@ public class EdmSimpleTypeFacadeTest extends BaseTest {
parseWrongLiteralContent("9876543210", EdmLiteralException.LITERALFORMAT);
parseWrongLiteralContent("-9876543210", EdmLiteralException.LITERALFORMAT);
parseWrongLiteralContent("12345678901234567890L", EdmLiteralException.LITERALFORMAT);
- parseWrongLiteralContent("12345678901234567890D", EdmLiteralException.LITERALFORMAT);
- parseWrongLiteralContent("1234567890F", EdmLiteralException.LITERALFORMAT);
parseWrongLiteralContent("guid'a'", EdmLiteralException.LITERALFORMAT);
parseWrongLiteralContent("datetime'1'", EdmLiteralException.LITERALFORMAT);
parseWrongLiteralContent("datetimeoffset'2'", EdmLiteralException.LITERALFORMAT);