Prevent double registering components when injecting managed client

Change-Id: I4f1c3e6642800cff4e47b1e81f0a49b9bbd07c84
(cherry picked from commit 927b4d0)

Author: Adam Lindenthal

core-common/src/main/java/org/glassfish/jersey/model/internal/ComponentBag.java

@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) 2012-2014 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012-2016 Oracle and/or its affiliates. All rights reserved.
  *
  * The contents of this file are subject to the terms of either the GNU
  * General Public License Version 2 only ("GPL") or the Common Development
@@ -400,7 +400,7 @@ private boolean registerModel(final Class<?> componentClass,
             public Boolean call() {
                 if (models.containsKey(componentClass)) {
                     Errors.error(LocalizationMessages.COMPONENT_TYPE_ALREADY_REGISTERED(componentClass),
-                            Severity.WARNING);
+                            Severity.HINT);
                     return false;
                 }
 

core-server/src/main/java/org/glassfish/jersey/server/internal/inject/WebTargetValueFactoryProvider.java

@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) 2012-2015 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012-2016 Oracle and/or its affiliates. All rights reserved.
  *
  * The contents of this file are subject to the terms of either the GNU
  * General Public License Version 2 only ("GPL") or the Common Development
@@ -319,13 +319,18 @@ public ManagedClient get() {
     }
 
     private void copyProviders(Configuration source, Configurable<?> target) {
+        final Configuration targetConfig = target.getConfiguration();
         for (Class<?> c : source.getClasses()) {
-            target.register(c, source.getContracts(c));
+            if (!targetConfig.isRegistered(c)) {
+                target.register(c, source.getContracts(c));
+            }
         }
 
         for (Object o : source.getInstances()) {
             Class<?> c = o.getClass();
-            target.register(c, source.getContracts(c));
+            if (!targetConfig.isRegistered(o)) {
+                target.register(c, source.getContracts(c));
+            }
         }
     }