procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Import GNU Classpath (20121202).

Browse source 
2012-12-19  Matthias Klose  <doko@ubuntu.com>

        Import GNU Classpath (20121202).

        * Regenerate class and header files.
        * Regenerate auto* files.
        * sources.am, gcj/javaprims.h: Regenerate.
        * gnu/java/nio/FileLockImpl.java (close): New override.

From-SVN: r194618
This commit is contained in:
Matthias Klose 2012-12-19 17:03:15 +00:00
parent baeb2e1647
commit a1906e8bbf
454 changed files with 5224 additions and 2925 deletions
Download patch file Download diff file Expand all files Collapse all files

21
libjava/classpath/java/util/Formatter.java
View file

@ -678,6 +678,12 @@ public final class Formatter
conversion);
noPrecision(precision);
if (arg == null)
{
genericFormat("null", flags, width, precision);
return;
}
int theChar;
if (arg instanceof Character)
theChar = ((Character) arg).charValue();
@ -748,6 +754,12 @@ public final class Formatter
int radix, char conversion)
{
assert radix == 8 || radix == 10 || radix == 16;
if (arg == null)
{
return new CPStringBuilder("null");
}
noPrecision(precision);
// Some error checking.
@ -1353,9 +1365,12 @@ public final class Formatter
argumentIndex = previousArgumentIndex;
// Argument indices start at 1 but array indices at 0.
--argumentIndex;
if (argumentIndex < 0 || argumentIndex >= args.length)
throw new MissingFormatArgumentException(format.substring(start, index));
argument = args[argumentIndex];
if (args != null)
{
if (argumentIndex < 0 || argumentIndex >= args.length)
throw new MissingFormatArgumentException(format.substring(start, index));
argument = args[argumentIndex];
}
}
switch (conversion)