diff options
| author | Markus Knauer | 2016-06-05 18:08:03 +0000 |
|---|---|---|
| committer | Markus Knauer | 2016-06-05 18:11:13 +0000 |
| commit | 0a349fc69c792ca6618a5ed65493029214848b2e (patch) | |
| tree | 090025d989a680935ee47b8be3f45fd9fb3c429d | |
| parent | f43472054df6c7ac90d62f2b7931c81a58dc8e2e (diff) | |
| download | org.eclipse.epp.logging-0a349fc69c792ca6618a5ed65493029214848b2e.tar.gz org.eclipse.epp.logging-0a349fc69c792ca6618a5ed65493029214848b2e.tar.xz org.eclipse.epp.logging-0a349fc69c792ca6618a5ed65493029214848b2e.zip | |
[net] Revert adding eclipse.uuid to error reportsNEON_R
This reverts commit 3f0c6dbd637ea526634e98b6aee7cf5a492079ce and commit
96f4a2bed9a1bc2d28213dc22a68bb7bf13f8814.
Bug: 492917
Change-Id: I54215a7412b2936783ed8175ce64b59da9c39389
Signed-off-by: Markus Knauer <mknauer@eclipsesource.com>
| -rw-r--r-- | bundles/org.eclipse.epp.logging.aeri.ide/src/org/eclipse/epp/internal/logging/aeri/ide/server/mars/IO.java | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/bundles/org.eclipse.epp.logging.aeri.ide/src/org/eclipse/epp/internal/logging/aeri/ide/server/mars/IO.java b/bundles/org.eclipse.epp.logging.aeri.ide/src/org/eclipse/epp/internal/logging/aeri/ide/server/mars/IO.java index 546cd2fa8..74f0c2f0e 100644 --- a/bundles/org.eclipse.epp.logging.aeri.ide/src/org/eclipse/epp/internal/logging/aeri/ide/server/mars/IO.java +++ b/bundles/org.eclipse.epp.logging.aeri.ide/src/org/eclipse/epp/internal/logging/aeri/ide/server/mars/IO.java @@ -8,9 +8,7 @@ package org.eclipse.epp.internal.logging.aeri.ide.server.mars; import static com.google.common.base.Charsets.UTF_8; -import static java.lang.System.getProperty; import static org.apache.commons.lang3.ArrayUtils.contains; -import static org.apache.commons.lang3.StringUtils.*; import static org.eclipse.epp.internal.logging.aeri.ide.server.Proxies.*; import static org.eclipse.epp.internal.logging.aeri.ide.server.mars.ServerResponse.KEYWORD_NEEDINFO; import static org.eclipse.epp.logging.aeri.core.ProblemStatus.*; @@ -101,7 +99,6 @@ public class IO { Request request = Request.Post(target).viaProxy(getProxyHost(target).orNull()).body(entity) .connectTimeout(configuration.getConnectTimeoutMs()).staleConnectionCheck(true) .socketTimeout(configuration.getSocketTimeoutMs()); - setEclipseUuid(request, target); String response = proxyAuthentication(executor, target).execute(request).returnContent().asString(); ServerResponse raw = Json.deserialize(response, ServerResponse.class); @@ -170,7 +167,6 @@ public class IO { .staleConnectionCheck(true) .socketTimeout(configuration.getSocketTimeoutMs()); // @formatter:on - setEclipseUuid(request, target); Response response = Proxies.proxyAuthentication(executor, target).execute(request); @@ -206,22 +202,9 @@ public class IO { int socketTimeout = (int) TimeUnit.SECONDS.toMillis(10); Request request = Request.Get(target).viaProxy(getProxyHost(target).orNull()).connectTimeout(connectTimeout) .staleConnectionCheck(true).socketTimeout(socketTimeout); - setEclipseUuid(request, target); return proxyAuthentication(executor, target).execute(request); } - private static void setEclipseUuid(Request request, URI target) { - try { - if (!endsWith(target.getHost(), "eclipse.org")) { - return; - } - String eclipseUuid = defaultIfBlank(getProperty("eclipse.uuid"), "unknownUUID"); - request.setHeader("eclipse.uuid", eclipseUuid); - } catch (Exception e) { - Logs.warn("Failed to set eclipse.uuid", e); - } - } - @VisibleForTesting public static ProblemStatus tryParse(ServerResponse response) { @@ -269,4 +252,5 @@ public class IO { return UNCONFIRMED; } } + } |
