svn commit: r1326662 - in /accumulo/trunk: ./ core/ core/src/main/java/org/apache/accumulo/core/iterators/system/SynchronizedIterator.java

[afuchs]

Author: afuchs
Date: Mon Apr 16 15:51:01 2012
New Revision: 1326662

URL: http://svn.apache.org/viewvc?rev=1326662&view=rev
Log:
ACCUMULO-533 merge from 1.4 branch

Modified:
    accumulo/trunk/   (props changed)
    accumulo/trunk/core/   (props changed)
    
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/system/SynchronizedIterator.java

Propchange: accumulo/trunk/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.4/src:r1325932-1326654
  Merged /accumulo/branches/1.4:r1325931-1326654

Propchange: accumulo/trunk/core/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.4/src/core:r1325932-1326654

Modified: 
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/system/SynchronizedIterator.java
URL: 
http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/system/SynchronizedIterator.java?rev=1326662&r1=1326661&r2=1326662&view=diff
==============================================================================
--- 
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/system/SynchronizedIterator.java
 (original)
+++ 
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/system/SynchronizedIterator.java
 Mon Apr 16 15:51:01 2012
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.apache.accumulo.core.iterators.system;
 
 import java.io.IOException;
@@ -14,8 +30,8 @@ import org.apache.hadoop.io.WritableComp
 /***
  * SynchronizedIterator: wrap a SortedKeyValueIterator so that all of its 
methods are synchronized
  */
-public class SynchronizedIterator <K extends WritableComparable<?>,V extends 
Writable> implements SortedKeyValueIterator<K,V> {
-
+public class SynchronizedIterator<K extends WritableComparable<?>,V extends 
Writable> implements SortedKeyValueIterator<K,V> {
+  
   private SortedKeyValueIterator<K,V> source = null;
   
   @Override
@@ -23,41 +39,40 @@ public class SynchronizedIterator <K ext
     this.source = source;
     source.init(source, options, env);
   }
-
+  
   @Override
   public synchronized boolean hasTop() {
     return source.hasTop();
   }
-
+  
   @Override
   public synchronized void next() throws IOException {
     source.next();
   }
-
+  
   @Override
   public synchronized void seek(Range range, Collection<ByteSequence> 
columnFamilies, boolean inclusive) throws IOException {
     source.seek(range, columnFamilies, inclusive);
   }
-
+  
   @Override
   public synchronized K getTopKey() {
     return source.getTopKey();
   }
-
+  
   @Override
   public synchronized V getTopValue() {
     return source.getTopValue();
   }
-
+  
   @Override
   public synchronized SortedKeyValueIterator<K,V> deepCopy(IteratorEnvironment 
env) {
     return new SynchronizedIterator<K,V>(source.deepCopy(env));
   }
   
-  public SynchronizedIterator(){}
+  public SynchronizedIterator() {}
   
-  public SynchronizedIterator(SortedKeyValueIterator<K,V> source)
-  {
+  public SynchronizedIterator(SortedKeyValueIterator<K,V> source) {
     this.source = source;
   }
 }