accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From e..@apache.org
Subject [03/38] git commit: ACCUMULO-286 fixed mysteriously broken parameterization in ContextFactory
Date Tue, 26 Nov 2013 15:47:07 GMT
ACCUMULO-286 fixed mysteriously broken parameterization in ContextFactory

git-svn-id: https://svn.apache.org/repos/asf/incubator/accumulo/trunk@1229638 13f79535-47bb-0310-9956-ffa450edef68
(cherry picked from commit dd31ed78ac3c7d8965c050b668166d1faa510aa6)

Reason: Testing
Author: Billie Rinaldi <billie@apache.org>
Ref: ACCUMULO-1792

Signed-off-by: Eric Newton <eric.newton@gmail.com>


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/6bba9406
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/6bba9406
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/6bba9406

Branch: refs/heads/1.5.1-SNAPSHOT
Commit: 6bba9406c6dcc08c64149bb6cb801086c15558ee
Parents: 792af9a
Author: Billie Rinaldi <billie@apache.org>
Authored: Tue Jan 10 17:01:38 2012 +0000
Committer: Eric Newton <eric.newton@gmail.com>
Committed: Mon Nov 25 16:06:42 2013 -0500

----------------------------------------------------------------------
 .../java/org/apache/accumulo/core/util/ContextFactory.java    | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/6bba9406/src/core/src/main/java/org/apache/accumulo/core/util/ContextFactory.java
----------------------------------------------------------------------
diff --git a/src/core/src/main/java/org/apache/accumulo/core/util/ContextFactory.java b/src/core/src/main/java/org/apache/accumulo/core/util/ContextFactory.java
index 67819da..61e853d 100644
--- a/src/core/src/main/java/org/apache/accumulo/core/util/ContextFactory.java
+++ b/src/core/src/main/java/org/apache/accumulo/core/util/ContextFactory.java
@@ -147,16 +147,15 @@ public class ContextFactory {
     }
   }
   
-  @SuppressWarnings("unchecked")
+  @SuppressWarnings({"unchecked", "rawtypes"})
   public static <K1,V1,K2,V2> Mapper<K1,V1,K2,V2>.Context createMapContext(Mapper<K1,V1,K2,V2>
m, TaskAttemptContext tac, RecordReader<K1,V1> reader,
       RecordWriter<K2,V2> writer, InputSplit split) {
     try {
       if (useV21) {
         Object basis = MAP_CONTEXT_IMPL_CONSTRUCTOR.newInstance(tac.getConfiguration(), tac.getTaskAttemptID(),
reader, writer, null, null, split);
-        return (Mapper<K1,V1,K2,V2>.Context) MAP_CONTEXT_CONSTRUCTOR.newInstance((Mapper<K1,V1,K2,V2>)
MAP_CONSTRUCTOR.newInstance(), basis);
+        return (Mapper.Context) MAP_CONTEXT_CONSTRUCTOR.newInstance((Mapper<K1,V1,K2,V2>)
MAP_CONSTRUCTOR.newInstance(), basis);
       } else {
-        return (Mapper<K1,V1,K2,V2>.Context) MAP_CONTEXT_CONSTRUCTOR.newInstance(m,
tac.getConfiguration(), tac.getTaskAttemptID(), reader, writer, null, null,
-            split);
+        return (Mapper.Context) MAP_CONTEXT_CONSTRUCTOR.newInstance(m, tac.getConfiguration(),
tac.getTaskAttemptID(), reader, writer, null, null, split);
       }
     } catch (InstantiationException e) {
       throw new IllegalArgumentException("Can't create object", e);


Mime
View raw message