Make MetaData multi-valued to preserve values of repeating WARC and HTTP headers

- code cleanup: fix indentation, remove unneeded return statements

Author: sebastian-nagel

src/main/java/org/archive/resource/MetaData.java

@@ -83,7 +83,6 @@ public int optInt(String key, int defaultValue) {
 				return super.getInt(key);
 			} catch(JSONException e) {
 				LOG.severe(e.getMessage());
-				return defaultValue;
 			}
 		}
 		return defaultValue;
@@ -106,7 +105,6 @@ public long optLong(String key, long defaultValue) {
 				return super.getLong(key);
 			} catch(JSONException e) {
 				LOG.severe(e.getMessage());
-				return defaultValue;
 			}
 		}
 		return defaultValue;
@@ -167,10 +165,10 @@ public JSONObject put(String key, Object value) {
 				((JSONArray) super.get(key)).put(value);
 				return this;
 			} else {
-	            JSONArray array = new JSONArray();
-	            array.put(super.get(key));
-	            array.put(value);
-	            super.put(key, array);
+				JSONArray array = new JSONArray();
+				array.put(super.get(key));
+				array.put(value);
+				super.put(key, array);
 			}
 			return super.accumulate(key, value);
 		}