OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

re PR cp-tools/39177 (trunk revision 144128 - jar: internal error: java.lang.NullPointerException) 

2009-10-22  Richard Guenther  <rguenther@suse.de>

        PR cp-tools/39177
        * tools/gnu/classpath/tools/jar/Creator.java (writeCommandLineEntries):
        Do not use uninitialized manifest.
        * tools/classes/gnu/classpath/tools/jar/Creator.class: Re-generated.

From-SVN: r153462
This commit is contained in:
Richard Guenther 2009-10-22 15:50:46 +00:00 committed by Richard Biener
parent 3af343dc8a
commit f456e029fd
3 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libjava/classpath/ChangeLog
View File

@ -1,3 +1,10 @@
2009-10-22 Richard Guenther <rguenther@suse.de>
PR cp-tools/39177
* tools/gnu/classpath/tools/jar/Creator.java (writeCommandLineEntries):
Do not use uninitialized manifest.
* tools/classes/gnu/classpath/tools/jar/Creator.class: Re-generated.
2009-10-15 Release Manager
* GCC 4.4.2 released.

BIN
libjava/classpath/tools/classes/gnu/classpath/tools/jar/Creator.class
View File

Binary file not shown.

11
libjava/classpath/tools/gnu/classpath/tools/jar/Creator.java
View File

@ -216,11 +216,14 @@ public class Creator
manifest = createManifest(parameters);
/* If no version is specified, provide the same manifest version default
* as Sun's jar tool */
Attributes attr = manifest.getMainAttributes();
if (attr.getValue(Attributes.Name.MANIFEST_VERSION) == null)
attr.putValue(Attributes.Name.MANIFEST_VERSION.toString(), "1.0");
attr.putValue("Created-By", System.getProperty("java.version") +
if (parameters.wantManifest)
{
Attributes attr = manifest.getMainAttributes();
if (attr.getValue(Attributes.Name.MANIFEST_VERSION) == null)
attr.putValue(Attributes.Name.MANIFEST_VERSION.toString(), "1.0");
attr.putValue("Created-By", System.getProperty("java.version") +
" (" + System.getProperty("java.vendor") + ")");
}
outputStream = new JarOutputStream(os, manifest);
// FIXME: this sets the method too late for the manifest file.
outputStream.setMethod(parameters.storageMode);