From 26e18839d3c5a8a296cba6aef05dc7fd4abd822c Mon Sep 17 00:00:00 2001
From: Jari Ojala <jari.j.ojala@tieto.com>
Date: Wed, 2 Apr 2014 10:43:58 +0300
Subject: [PATCH] Fixed memory leak when registering Jersey2LoggingFilter.
 Removed dependencies to Jersey internal classes (that prevented upgrade to
 Jersey 2.6 and newer).

Conflicts:
	openstack-client-connectors/jersey2-connector/src/main/java/com/woorea/openstack/connector/JaxRs20Connector.java
	openstack-client-connectors/jersey2-connector/src/main/java/com/woorea/openstack/connector/Jersey2LoggingFilter.java
---
 .../com/woorea/openstack/connector/JaxRs20Connector.java    | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/openstack-client-connectors/jersey2-connector/src/main/java/com/woorea/openstack/connector/JaxRs20Connector.java b/openstack-client-connectors/jersey2-connector/src/main/java/com/woorea/openstack/connector/JaxRs20Connector.java
index 2171beacf..6c2f6c5d7 100644
--- a/openstack-client-connectors/jersey2-connector/src/main/java/com/woorea/openstack/connector/JaxRs20Connector.java
+++ b/openstack-client-connectors/jersey2-connector/src/main/java/com/woorea/openstack/connector/JaxRs20Connector.java
@@ -24,6 +24,10 @@ public class JaxRs20Connector implements OpenStackClientConnector {
 	protected Client client = OpenStack.CLIENT;
     private LoggingFilter logger = new LoggingFilter(Logger.getLogger("os"), 10000);
 
+	public JaxRs20Connector() {
+		client.register(logger);
+	}
+
 	@Override
 	public <T> OpenStackResponse request(OpenStackRequest<T> request) {
 		WebTarget target = client.target(request.endpoint()).path(request.path());
@@ -33,7 +37,7 @@ public <T> OpenStackResponse request(OpenStackRequest<T> request) {
 				target = target.queryParam(entry.getKey(), o);
 			}
 		}
-        target.register(logger);
+
 		Invocation.Builder invocation = target.request();
 
 		for(Map.Entry<String, List<Object>> h : request.headers().entrySet()) {