Blob Blame History Raw
diff -Nru avro-1.7.6/lang/java/ipc/src/main/java/org/apache/avro/ipc/stats/StaticServlet.java avro-1.7.6.jdk8/lang/java/ipc/src/main/java/org/apache/avro/ipc/stats/StaticServlet.java
--- avro-1.7.6/lang/java/ipc/src/main/java/org/apache/avro/ipc/stats/StaticServlet.java	2016-08-01 19:05:03.749293751 +0200
+++ avro-1.7.6.jdk8/lang/java/ipc/src/main/java/org/apache/avro/ipc/stats/StaticServlet.java	2016-08-01 19:04:37.659524998 +0200
@@ -34,13 +34,9 @@
     String[] parts = pathInContext.split("/");
     String filename =  parts[parts.length - 1];
 
-    try {
       URL resource = getClass().getClassLoader().getResource(
           "org/apache/avro/ipc/stats/static/" + filename);
       if (resource == null) { return null; }
       return Resource.newResource(resource);
-    } catch (IOException e) {
-      return null;
-    }
   }
 } 
diff -Nru avro-1.7.6/lang/java/ipc/src/main/java/org/apache/avro/ipc/trace/StaticServlet.java avro-1.7.6.jdk8/lang/java/ipc/src/main/java/org/apache/avro/ipc/trace/StaticServlet.java
--- avro-1.7.6/lang/java/ipc/src/main/java/org/apache/avro/ipc/trace/StaticServlet.java	2016-08-01 19:05:03.750293704 +0200
+++ avro-1.7.6.jdk8/lang/java/ipc/src/main/java/org/apache/avro/ipc/trace/StaticServlet.java	2016-08-01 19:04:37.660524951 +0200
@@ -38,13 +38,9 @@
     }
     String filename =  parts[parts.length - 1];
 
-    try {
       URL resource = getClass().getClassLoader().getResource(
           "org/apache/avro/ipc/trace/static/" + filename);
       if (resource == null) { return null; }
       return Resource.newResource(resource);
-    } catch (IOException e) {
-      return null;
-    }
   }
 } 
diff -Nru avro-1.7.6/lang/java/thrift/src/main/java/org/apache/avro/thrift/ThriftData.java avro-1.7.6.jdk8/lang/java/thrift/src/main/java/org/apache/avro/thrift/ThriftData.java
--- avro-1.7.6/lang/java/thrift/src/main/java/org/apache/avro/thrift/ThriftData.java	2014-01-09 18:24:50.000000000 +0100
+++ avro-1.7.6.jdk8/lang/java/thrift/src/main/java/org/apache/avro/thrift/ThriftData.java	2016-08-01 19:04:37.661524904 +0200
@@ -102,7 +102,7 @@
     if (fields == null) {                           // cache miss
       fields = new TFieldIdEnum[s.getFields().size()];
       Class c = r.getClass();
-      for (TFieldIdEnum f : FieldMetaData.getStructMetaDataMap(c).keySet())
+      for (TFieldIdEnum f : FieldMetaData.getStructMetaDataMap((Class<? extends TBase>) c).keySet())
         fields[s.getField(f.getFieldName()).pos()] = f;
       fieldCache.put(s, fields);                  // update cache
     }
@@ -171,7 +171,7 @@
                                        Throwable.class.isAssignableFrom(c));
           List<Field> fields = new ArrayList<Field>();
           for (FieldMetaData f :
-                 FieldMetaData.getStructMetaDataMap(c).values()) {
+                 FieldMetaData.getStructMetaDataMap((Class<? extends TBase>) c).values()) {
             Schema s = getSchema(f.valueMetaData);
             if (f.requirementType == TFieldRequirementType.OPTIONAL
                 && (s.getType() != Schema.Type.UNION))