You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by sk...@apache.org on 2014/06/27 09:25:17 UTC
git commit: [OLINGO-330] fixed
Repository: olingo-odata2
Updated Branches:
refs/heads/master 6ac100f51 -> 12a391f93
[OLINGO-330] fixed
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata2/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata2/commit/12a391f9
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata2/tree/12a391f9
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata2/diff/12a391f9
Branch: refs/heads/master
Commit: 12a391f93c8116caf7a23b12537df98a6734f20a
Parents: 6ac100f
Author: Stephan Klevenz <sk...@apache.org>
Authored: Fri Jun 27 09:23:45 2014 +0200
Committer: Stephan Klevenz <sk...@apache.org>
Committed: Fri Jun 27 09:23:45 2014 +0200
----------------------------------------------------------------------
.../main/java/org/apache/olingo/odata2/core/servlet/RestUtil.java | 1 +
odata2-lib/odata-core/src/main/resources/i18n_en.properties | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/12a391f9/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/servlet/RestUtil.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/servlet/RestUtil.java b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/servlet/RestUtil.java
index e5b5555..36a1f65 100644
--- a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/servlet/RestUtil.java
+++ b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/servlet/RestUtil.java
@@ -269,6 +269,7 @@ public class RestUtil {
if (index < 0) {
odataSegments.add(new ODataPathSegmentImpl(segment, null));
} else {
+ // post condition: we do not allow matrix parameters in OData path segments
String path = segment.substring(0, index);
Map<String, List<String>> parameterMap = extractMatrixParameter(segment, index);
throw new ODataNotFoundException(ODataNotFoundException.MATRIX.addContent(parameterMap.keySet(), path));
http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/12a391f9/odata2-lib/odata-core/src/main/resources/i18n_en.properties
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-core/src/main/resources/i18n_en.properties b/odata2-lib/odata-core/src/main/resources/i18n_en.properties
index d6d0654..564dfef 100644
--- a/odata2-lib/odata-core/src/main/resources/i18n_en.properties
+++ b/odata2-lib/odata-core/src/main/resources/i18n_en.properties
@@ -107,7 +107,7 @@ org.apache.olingo.odata2.api.exception.ODataBadRequestException.AMBIGUOUS_XMETHO
org.apache.olingo.odata2.api.exception.ODataForbiddenException.COMMON=Forbidden
-org.apache.olingo.odata2.api.exception.ODataNotFoundException.MATRIX=Matrix parameter '%1$s' with path segment '%2$s' not found!
+org.apache.olingo.odata2.api.exception.ODataNotFoundException.MATRIX=Matrix parameter '%1$s' in path segment '%2$s' not supported!
org.apache.olingo.odata2.api.exception.ODataNotFoundException.ENTITY=Requested entity could not be found.
org.apache.olingo.odata2.api.exception.ODataMethodNotAllowedException.DISPATCH=The request dispatcher does not allow the HTTP method used for the request.