From facc014b8f05b4465a24e1d6612fabf1420a62cb Mon Sep 17 00:00:00 2001
From: Jason Leyba <jleyba@google.com>
Date: Thu, 11 Jul 2013 09:43:12 -0700
Subject: [PATCH] The augmenter should not add handlers for role interfaces the
 augmented object already implements.

---
 java/client/src/org/openqa/selenium/remote/Augmenter.java | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/java/client/src/org/openqa/selenium/remote/Augmenter.java b/java/client/src/org/openqa/selenium/remote/Augmenter.java
index 2afa4a6c07f87..0b0d1f63d7314 100644
--- a/java/client/src/org/openqa/selenium/remote/Augmenter.java
+++ b/java/client/src/org/openqa/selenium/remote/Augmenter.java
@@ -211,8 +211,12 @@ private CompoundHandler determineAugmentation(WebDriver driver,
         continue;
       }
 
-      handler.addCapabilityHander(augmenter.getDescribedInterface(),
-          augmenter.getImplementation(value));
+      Class<?> iface = augmenter.getDescribedInterface();
+      if (iface.isInstance(objectToAugment)) {
+        continue;
+      }
+
+      handler.addCapabilityHander(iface, augmenter.getImplementation(value));
     }
     return handler;
   }