diff --git a/search-services/alfresco-solrclient-lib/src/main/java/org/alfresco/solr/BoundedDeque.java b/search-services/alfresco-solrclient-lib/src/main/java/org/alfresco/solr/BoundedDeque.java
index 8c83553f6..9717dc89a 100644
--- a/search-services/alfresco-solrclient-lib/src/main/java/org/alfresco/solr/BoundedDeque.java
+++ b/search-services/alfresco-solrclient-lib/src/main/java/org/alfresco/solr/BoundedDeque.java
@@ -1,28 +1,28 @@
-/*
- * #%L
- * Alfresco Solr Client
- * %%
- * Copyright (C) 2005 - 2016 Alfresco Software Limited
- * %%
- * This file is part of the Alfresco software. 
- * If the software was purchased under a paid Alfresco license, the terms of 
- * the paid license agreement will prevail.  Otherwise, the software is 
- * provided under the following open source license terms:
- * 
- * Alfresco is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * Alfresco is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
- * #L%
- */
+/*
+ * #%L
+ * Alfresco Solr Client
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
 
 package org.alfresco.solr;
 
@@ -38,7 +38,7 @@ public class BoundedDeque<T> implements Iterable<T>
     public BoundedDeque(int max)
     {
         this.max = max;
-        setDeque(new LinkedBlockingDeque<T>());
+        this.deque = new LinkedBlockingDeque<T>();
     }
 
     /**
@@ -46,21 +46,21 @@ public class BoundedDeque<T> implements Iterable<T>
      */
     public int size()
     {
-        return getDeque().size();
+        return deque.size();
     }
 
     public void add(T add)
     {
-        while (getDeque().size() > (max - 1))
+        while (deque.size() > (max - 1))
         {
-            getDeque().removeLast();
+            deque.removeLast();
         }
-        getDeque().addFirst(add);
+        deque.addFirst(add);
     }
 
     public T getLast()
     {
-        return getDeque().getFirst();
+        return deque.getFirst();
     }
 
     /*
@@ -70,17 +70,17 @@ public class BoundedDeque<T> implements Iterable<T>
     @Override
     public Iterator<T> iterator()
     {
-        return getDeque().iterator();
+        return deque.iterator();
     }
 
+    /** Get a copy of the deque. */
     public LinkedBlockingDeque<T> getDeque()
     {
-        return deque;
+        return new LinkedBlockingDeque(deque);
     }
 
     public void setDeque(LinkedBlockingDeque<T> deque)
     {
-        this.deque = deque;
+        this.deque = new LinkedBlockingDeque(deque);
     }
-
-}
\ No newline at end of file
+}