--- old/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/writer/SingleStreamCodeWriter.java 2016-09-22 17:06:50.157731454 +0300 +++ new/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/writer/SingleStreamCodeWriter.java 2016-09-22 17:06:50.069728734 +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 @@ -55,21 +55,24 @@ out = new PrintStream(os); } + @Override public OutputStream openBinary(JPackage pkg, String fileName) throws IOException { - String pkgName = pkg.name(); - if(pkgName.length()!=0) pkgName += '.'; + final String name = pkg != null && pkg.name().length() > 0 + ? pkg.name() + '.' + fileName : fileName; out.println( - "-----------------------------------" + pkgName+fileName + + "-----------------------------------" + name + "-----------------------------------"); return new FilterOutputStream(out) { + @Override public void close() { // don't let this stream close } }; } + @Override public void close() throws IOException { out.close(); }