jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/writer/ZipCodeWriter.java
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/writer/ZipCodeWriter.java Wed Jul 05 22:27:20 2017 +0200
+++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/writer/ZipCodeWriter.java Tue Nov 15 23:43:38 2016 +0300
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -49,6 +49,7 @@
zip = new ZipOutputStream(target);
// nullify the close method.
filter = new FilterOutputStream(zip){
+ @Override
public void close() {}
};
}
@@ -57,10 +58,9 @@
private final OutputStream filter;
+ @Override
public OutputStream openBinary(JPackage pkg, String fileName) throws IOException {
- String name = fileName;
- if(!pkg.isUnnamed()) name = toDirName(pkg)+name;
-
+ final String name = pkg == null || pkg.isUnnamed() ? fileName : toDirName(pkg)+fileName;
zip.putNextEntry(new ZipEntry(name));
return filter;
}
@@ -70,6 +70,7 @@
return pkg.name().replace('.','/')+'/';
}
+ @Override
public void close() throws IOException {
zip.close();
}