You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by ch...@apache.org on 2014/10/01 11:05:22 UTC
git commit: [OLINGO-447] Remove previous invalid fix
Repository: olingo-odata4
Updated Branches:
refs/heads/master 34825ab06 -> ad3fbfb4c
[OLINGO-447] Remove previous invalid fix
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/ad3fbfb4
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/ad3fbfb4
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/ad3fbfb4
Branch: refs/heads/master
Commit: ad3fbfb4cb485170c01c49ec6ffb287f8c59182a
Parents: 34825ab
Author: Christian Amend <ch...@apache.org>
Authored: Wed Oct 1 11:04:34 2014 +0200
Committer: Christian Amend <ch...@apache.org>
Committed: Wed Oct 1 11:04:34 2014 +0200
----------------------------------------------------------------------
.../java/org/apache/olingo/fit/tecsvc/http/BasicHttpITCase.java | 2 +-
.../test/java/org/apache/olingo/fit/tecsvc/http/PingITCase.java | 3 +++
.../java/org/apache/olingo/commons/api/format/AcceptType.java | 3 ---
3 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ad3fbfb4/fit/src/test/java/org/apache/olingo/fit/tecsvc/http/BasicHttpITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/tecsvc/http/BasicHttpITCase.java b/fit/src/test/java/org/apache/olingo/fit/tecsvc/http/BasicHttpITCase.java
index f8c4c2f..ba008d6 100644
--- a/fit/src/test/java/org/apache/olingo/fit/tecsvc/http/BasicHttpITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/tecsvc/http/BasicHttpITCase.java
@@ -107,6 +107,7 @@ public class BasicHttpITCase extends AbstractBaseTestITCase{
connection.setRequestMethod("GET");
connection.setRequestProperty(HttpHeader.ODATA_MAX_VERSION, "4.0");
+ connection.setRequestProperty(HttpHeader.ACCEPT, "*/*");
connection.connect();
@@ -118,7 +119,6 @@ public class BasicHttpITCase extends AbstractBaseTestITCase{
@Override
protected CommonODataClient<?> getClient() {
- // TODO Auto-generated method stub
return null;
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ad3fbfb4/fit/src/test/java/org/apache/olingo/fit/tecsvc/http/PingITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/tecsvc/http/PingITCase.java b/fit/src/test/java/org/apache/olingo/fit/tecsvc/http/PingITCase.java
index f706ddd..a8251ef 100644
--- a/fit/src/test/java/org/apache/olingo/fit/tecsvc/http/PingITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/tecsvc/http/PingITCase.java
@@ -19,6 +19,7 @@
package org.apache.olingo.fit.tecsvc.http;
import org.apache.olingo.client.api.CommonODataClient;
+import org.apache.olingo.commons.api.http.HttpHeader;
import org.apache.olingo.fit.AbstractBaseTestITCase;
import org.apache.olingo.fit.tecsvc.TecSvcConst;
import org.junit.Test;
@@ -45,6 +46,7 @@ public class PingITCase extends AbstractBaseTestITCase{
HttpURLConnection connection = (HttpURLConnection) url.openConnection();
connection.setRequestMethod("GET");
+ connection.setRequestProperty(HttpHeader.ACCEPT, "*/*");
connection.connect();
int code = connection.getResponseCode();
@@ -60,6 +62,7 @@ public class PingITCase extends AbstractBaseTestITCase{
HttpURLConnection connection = (HttpURLConnection) url.openConnection();
connection.setRequestMethod("GET");
+ connection.setRequestProperty(HttpHeader.ACCEPT, "*/*");
connection.connect();
int code = connection.getResponseCode();
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ad3fbfb4/lib/commons-api/src/main/java/org/apache/olingo/commons/api/format/AcceptType.java
----------------------------------------------------------------------
diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/format/AcceptType.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/format/AcceptType.java
index 2183242..59eaa5d 100644
--- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/format/AcceptType.java
+++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/format/AcceptType.java
@@ -112,9 +112,6 @@ public class AcceptType {
typeSubtype.add(tokens[0]);
typeSubtype.add(tokens[1]);
}
- } else if (tokens.length == 1 && "*".equals(tokens[0])) {
- typeSubtype.add(tokens[0]);
- typeSubtype.add(tokens[0]);
} else {
throw new IllegalArgumentException("Not exactly one '" + TypeUtil.TYPE_SUBTYPE_SEPARATOR +
"' in format '" + format + "', or it is at the beginning or at the end.");