The re-basing of the JDK-7050570 was blundered in one file, leading to build breakage on Solaris.


/tmp/jprt/P1/110621.albatem/s/jdk/src/solaris/classes/sun/nio/fs/SolarisUserDefinedFileAttributeView.java:51: error: ')' expected
            ((bytes.length <= 1 || (bytes.length == 2 && bytes[1] == '.')) {
                                                                          ^
/tmp/jprt/P1/110621.albatem/s/jdk/src/solaris/classes/sun/nio/fs/SolarisUserDefinedFileAttributeView.java:55: error: illegal start of type
        return bytes;
        ^
/tmp/jprt/P1/110621.albatem/s/jdk/src/solaris/classes/sun/nio/fs/SolarisUserDefinedFileAttributeView.java:55: error: ';' expected
        return bytes;
              ^
/tmp/jprt/P1/110621.albatem/s/jdk/src/solaris/classes/sun/nio/fs/SolarisUserDefinedFileAttributeView.java:58: error: class, interface, or enum expected
    private final UnixPath file;
                  ^
/tmp/jprt/P1/110621.albatem/s/jdk/src/solaris/classes/sun/nio/fs/SolarisUserDefinedFileAttributeView.java:59: error: class, interface, or enum expected
    private final boolean followLinks;
                  ^
/tmp/jprt/P1/110621.albatem/s/jdk/src/solaris/classes/sun/nio/fs/SolarisUserDefinedFileAttributeView.java:61: error: class, interface, or enum expected
    SolarisUserDefinedFileAttributeView(UnixPath file, boolean followLinks) {
    ^
/tmp/jprt/P1/110621.albatem/s/jdk/src/solaris/classes/sun/nio/fs/SolarisUserDefinedFileAttributeView.java:63: error: class, interface, or enum expected
        this.followLinks = followLinks;
        ^
/tmp/jprt/P1/110621.albatem/s/jdk/src/solaris/classes/sun/nio/fs/SolarisUserDefinedFileAttributeView.java:64: error: class, interface, or enum expected
    }
    ^
/tmp/jprt/P1/110621.albatem/s/jdk/src/solaris/classes/sun/nio/fs/SolarisUserDefinedFileAttributeView.java:67: error: class, interface, or enum expected
    public List<String> list() throws IOException {
           ^
/tmp/jprt/P1/110621.albatem/s/jdk/src/solaris/classes/sun/nio/fs/SolarisUserDefinedFileAttributeView.java:71: error: class, interface, or enum expected
        int fd = file.openForAttributeAccess(followLinks);
        ^
/tmp/jprt/P1/110621.albatem/s/jdk/src/solaris/classes/sun/nio/fs/SolarisUserDefinedFileAttributeView.java:72: error: class, interface, or enum expected
        try {
        ^
/tmp/jprt/P1/110621.albatem/s/jdk/src/solaris/classes/sun/nio/fs/SolarisUserDefinedFileAttributeView.java:76: error: class, interface, or enum expected
                long dp;
                ^
/tmp/jprt/P1/110621.albatem/s/jdk/src/solaris/classes/sun/nio/fs/SolarisUserDefinedFileAttributeView.java:77: error: class, interface, or enum expected
                try {
                ^
/tmp/jprt/P1/110621.albatem/s/jdk/src/solaris/classes/sun/nio/fs/SolarisUserDefinedFileAttributeView.java:79: error: class, interface, or enum expected
                } catch (UnixException x) {
                ^
/tmp/jprt/P1/110621.albatem/s/jdk/src/solaris/classes/sun/nio/fs/SolarisUserDefinedFileAttributeView.java:81: error: class, interface, or enum expected
                    throw x;
                    ^
/tmp/jprt/P1/110621.albatem/s/jdk/src/solaris/classes/sun/nio/fs/SolarisUserDefinedFileAttributeView.java:82: error: class, interface, or enum expected
                }
                ^
/tmp/jprt/P1/110621.albatem/s/jdk/src/solaris/classes/sun/nio/fs/SolarisUserDefinedFileAttributeView.java:86: error: class, interface, or enum expected
                try {
                ^
/tmp/jprt/P1/110621.albatem/s/jdk/src/solaris/classes/sun/nio/fs/SolarisUserDefinedFileAttributeView.java:88: error: class, interface, or enum expected
                    while ((name = readdir(dp)) != null) {
                    ^
/tmp/jprt/P1/110621.albatem/s/jdk/src/solaris/classes/sun/nio/fs/SolarisUserDefinedFileAttributeView.java:90: error: class, interface, or enum expected
                        if (!s.equals(".") && !s.equals(".."))
                        ^
/tmp/jprt/P1/110621.albatem/s/jdk/src/solaris/classes/sun/nio/fs/SolarisUserDefinedFileAttributeView.java:92: error: class, interface, or enum expected
                    }
                    ^
/tmp/jprt/P1/110621.albatem/s/jdk/src/solaris/classes/sun/nio/fs/SolarisUserDefinedFileAttributeView.java:95: error: class, interface, or enum expected
                }
                ^
/tmp/jprt/P1/110621.albatem/s/jdk/src/solaris/classes/sun/nio/fs/SolarisUserDefinedFileAttributeView.java:97: error: class, interface, or enum expected
            } catch (UnixException x) {
            ^
/tmp/jprt/P1/110621.albatem/s/jdk/src/solaris/classes/sun/nio/fs/SolarisUserDefinedFileAttributeView.java:101: error: class, interface, or enum expected
            }
            ^
/tmp/jprt/P1/110621.albatem/s/jdk/src/solaris/classes/sun/nio/fs/SolarisUserDefinedFileAttributeView.java:104: error: class, interface, or enum expected
        }
        ^
/tmp/jprt/P1/110621.albatem/s/jdk/src/solaris/classes/sun/nio/fs/SolarisUserDefinedFileAttributeView.java:108: error: class, interface, or enum expected
    public int size(String name) throws IOException {
           ^
/tmp/jprt/P1/110621.albatem/s/jdk/src/solaris/classes/sun/nio/fs/SolarisUserDefinedFileAttributeView.java:112: error: class, interface, or enum expected
        int fd = file.openForAttributeAccess(followLinks);
        ^
/tmp/jprt/P1/110621.albatem/s/jdk/src/solaris/classes/sun/nio/fs/SolarisUserDefinedFileAttributeView.java:113: error: class, interface, or enum expected
        try {
        ^
/tmp/jprt/P1/110621.albatem/s/jdk/src/solaris/classes/sun/nio/fs/SolarisUserDefinedFileAttributeView.java:117: error: class, interface, or enum expected
                try {
                ^
/tmp/jprt/P1/110621.albatem/s/jdk/src/solaris/classes/sun/nio/fs/SolarisUserDefinedFileAttributeView.java:120: error: class, interface, or enum expected
                    long size = attrs.size();
                    ^
/tmp/jprt/P1/110621.albatem/s/jdk/src/solaris/classes/sun/nio/fs/SolarisUserDefinedFileAttributeView.java:121: error: class, interface, or enum expected
                    if (size > Integer.MAX_VALUE)
                    ^
/tmp/jprt/P1/110621.albatem/s/jdk/src/solaris/classes/sun/nio/fs/SolarisUserDefinedFileAttributeView.java:123: error: class, interface, or enum expected
                    return (int)size;
                    ^
/tmp/jprt/P1/110621.albatem/s/jdk/src/solaris/classes/sun/nio/fs/SolarisUserDefinedFileAttributeView.java:124: error: class, interface, or enum expected
                } finally {
                ^
/tmp/jprt/P1/110621.albatem/s/jdk/src/solaris/classes/sun/nio/fs/SolarisUserDefinedFileAttributeView.java:126: error: class, interface, or enum expected
                }
                ^
/tmp/jprt/P1/110621.albatem/s/jdk/src/solaris/classes/sun/nio/fs/SolarisUserDefinedFileAttributeView.java:131: error: class, interface, or enum expected
            }
            ^
/tmp/jprt/P1/110621.albatem/s/jdk/src/solaris/classes/sun/nio/fs/SolarisUserDefinedFileAttributeView.java:134: error: class, interface, or enum expected
        }
        ^
/tmp/jprt/P1/110621.albatem/s/jdk/src/solaris/classes/sun/nio/fs/SolarisUserDefinedFileAttributeView.java:138: error: class, interface, or enum expected
    public int read(String name, ByteBuffer dst) throws IOException {
           ^
/tmp/jprt/P1/110621.albatem/s/jdk/src/solaris/classes/sun/nio/fs/SolarisUserDefinedFileAttributeView.java:142: error: class, interface, or enum expected
        int fd = file.openForAttributeAccess(followLinks);
        ^
/tmp/jprt/P1/110621.albatem/s/jdk/src/solaris/classes/sun/nio/fs/SolarisUserDefinedFileAttributeView.java:143: error: class, interface, or enum expected
        try {
        ^
/tmp/jprt/P1/110621.albatem/s/jdk/src/solaris/classes/sun/nio/fs/SolarisUserDefinedFileAttributeView.java:149: error: class, interface, or enum expected
                FileChannel fc = UnixChannelFactory.newFileChannel(afd, true, false);
                ^
/tmp/jprt/P1/110621.albatem/s/jdk/src/solaris/classes/sun/nio/fs/SolarisUserDefinedFileAttributeView.java:152: error: class, interface, or enum expected
                try {
                ^
/tmp/jprt/P1/110621.albatem/s/jdk/src/solaris/classes/sun/nio/fs/SolarisUserDefinedFileAttributeView.java:155: error: class, interface, or enum expected
                    int total = 0;
                    ^
/tmp/jprt/P1/110621.albatem/s/jdk/src/solaris/classes/sun/nio/fs/SolarisUserDefinedFileAttributeView.java:156: error: class, interface, or enum expected
                    while (dst.hasRemaining()) {
                    ^
/tmp/jprt/P1/110621.albatem/s/jdk/src/solaris/classes/sun/nio/fs/SolarisUserDefinedFileAttributeView.java:158: error: class, interface, or enum expected
                        if (n < 0)
                        ^
/tmp/jprt/P1/110621.albatem/s/jdk/src/solaris/classes/sun/nio/fs/SolarisUserDefinedFileAttributeView.java:160: error: class, interface, or enum expected
                        total += n;
                        ^
/tmp/jprt/P1/110621.albatem/s/jdk/src/solaris/classes/sun/nio/fs/SolarisUserDefinedFileAttributeView.java:161: error: class, interface, or enum expected
                    }
                    ^
/tmp/jprt/P1/110621.albatem/s/jdk/src/solaris/classes/sun/nio/fs/SolarisUserDefinedFileAttributeView.java:163: error: class, interface, or enum expected
                } finally {
                ^
/tmp/jprt/P1/110621.albatem/s/jdk/src/solaris/classes/sun/nio/fs/SolarisUserDefinedFileAttributeView.java:165: error: class, interface, or enum expected
                }
                ^
/tmp/jprt/P1/110621.albatem/s/jdk/src/solaris/classes/sun/nio/fs/SolarisUserDefinedFileAttributeView.java:170: error: class, interface, or enum expected
            }
            ^
/tmp/jprt/P1/110621.albatem/s/jdk/src/solaris/classes/sun/nio/fs/SolarisUserDefinedFileAttributeView.java:173: error: class, interface, or enum expected
        }
        ^
/tmp/jprt/P1/110621.albatem/s/jdk/src/solaris/classes/sun/nio/fs/SolarisUserDefinedFileAttributeView.java:177: error: class, interface, or enum expected
    public int write(String name, ByteBuffer src) throws IOException {
           ^
/tmp/jprt/P1/110621.albatem/s/jdk/src/solaris/classes/sun/nio/fs/SolarisUserDefinedFileAttributeView.java:181: error: class, interface, or enum expected
        int fd = file.openForAttributeAccess(followLinks);
        ^
/tmp/jprt/P1/110621.albatem/s/jdk/src/solaris/classes/sun/nio/fs/SolarisUserDefinedFileAttributeView.java:182: error: class, interface, or enum expected
        try {
        ^
/tmp/jprt/P1/110621.albatem/s/jdk/src/solaris/classes/sun/nio/fs/SolarisUserDefinedFileAttributeView.java:190: error: class, interface, or enum expected
                FileChannel fc = UnixChannelFactory.newFileChannel(afd, false, true);
                ^
/tmp/jprt/P1/110621.albatem/s/jdk/src/solaris/classes/sun/nio/fs/SolarisUserDefinedFileAttributeView.java:193: error: class, interface, or enum expected
                try {
                ^
/tmp/jprt/P1/110621.albatem/s/jdk/src/solaris/classes/sun/nio/fs/SolarisUserDefinedFileAttributeView.java:195: error: class, interface, or enum expected
                    while (src.hasRemaining()) {
                    ^
/tmp/jprt/P1/110621.albatem/s/jdk/src/solaris/classes/sun/nio/fs/SolarisUserDefinedFileAttributeView.java:197: error: class, interface, or enum expected
                    }
                    ^
/tmp/jprt/P1/110621.albatem/s/jdk/src/solaris/classes/sun/nio/fs/SolarisUserDefinedFileAttributeView.java:199: error: class, interface, or enum expected
                } finally {
                ^
/tmp/jprt/P1/110621.albatem/s/jdk/src/solaris/classes/sun/nio/fs/SolarisUserDefinedFileAttributeView.java:201: error: class, interface, or enum expected
                }
                ^
/tmp/jprt/P1/110621.albatem/s/jdk/src/solaris/classes/sun/nio/fs/SolarisUserDefinedFileAttributeView.java:206: error: class, interface, or enum expected
            }
            ^
/tmp/jprt/P1/110621.albatem/s/jdk/src/solaris/classes/sun/nio/fs/SolarisUserDefinedFileAttributeView.java:209: error: class, interface, or enum expected
        }
        ^
/tmp/jprt/P1/110621.albatem/s/jdk/src/solaris/classes/sun/nio/fs/SolarisUserDefinedFileAttributeView.java:213: error: class, interface, or enum expected
    public void delete(String name) throws IOException {
           ^
/tmp/jprt/P1/110621.albatem/s/jdk/src/solaris/classes/sun/nio/fs/SolarisUserDefinedFileAttributeView.java:217: error: class, interface, or enum expected
        int fd = file.openForAttributeAccess(followLinks);
        ^
/tmp/jprt/P1/110621.albatem/s/jdk/src/solaris/classes/sun/nio/fs/SolarisUserDefinedFileAttributeView.java:218: error: class, interface, or enum expected
        try {
        ^
/tmp/jprt/P1/110621.albatem/s/jdk/src/solaris/classes/sun/nio/fs/SolarisUserDefinedFileAttributeView.java:220: error: class, interface, or enum expected
            try {
            ^
/tmp/jprt/P1/110621.albatem/s/jdk/src/solaris/classes/sun/nio/fs/SolarisUserDefinedFileAttributeView.java:222: error: class, interface, or enum expected
            } finally {
            ^
/tmp/jprt/P1/110621.albatem/s/jdk/src/solaris/classes/sun/nio/fs/SolarisUserDefinedFileAttributeView.java:224: error: class, interface, or enum expected
            }
            ^
/tmp/jprt/P1/110621.albatem/s/jdk/src/solaris/classes/sun/nio/fs/SolarisUserDefinedFileAttributeView.java:229: error: class, interface, or enum expected
        } finally {
        ^
/tmp/jprt/P1/110621.albatem/s/jdk/src/solaris/classes/sun/nio/fs/SolarisUserDefinedFileAttributeView.java:231: error: class, interface, or enum expected
        }
        ^
/tmp/jprt/P1/110621.albatem/s/jdk/src/solaris/classes/sun/nio/fs/SolarisUserDefinedFileAttributeView.java:246: error: class, interface, or enum expected
            long dp = 0L;
            ^
/tmp/jprt/P1/110621.albatem/s/jdk/src/solaris/classes/sun/nio/fs/SolarisUserDefinedFileAttributeView.java:247: error: class, interface, or enum expected
            try {
            ^
/tmp/jprt/P1/110621.albatem/s/jdk/src/solaris/classes/sun/nio/fs/SolarisUserDefinedFileAttributeView.java:249: error: class, interface, or enum expected
            } catch (UnixException x) {
            ^
/tmp/jprt/P1/110621.albatem/s/jdk/src/solaris/classes/sun/nio/fs/SolarisUserDefinedFileAttributeView.java:251: error: class, interface, or enum expected
                throw x;
                ^
/tmp/jprt/P1/110621.albatem/s/jdk/src/solaris/classes/sun/nio/fs/SolarisUserDefinedFileAttributeView.java:252: error: class, interface, or enum expected
            }
            ^
/tmp/jprt/P1/110621.albatem/s/jdk/src/solaris/classes/sun/nio/fs/SolarisUserDefinedFileAttributeView.java:257: error: class, interface, or enum expected
                while ((name = readdir(dp)) != null) {
                ^
/tmp/jprt/P1/110621.albatem/s/jdk/src/solaris/classes/sun/nio/fs/SolarisUserDefinedFileAttributeView.java:262: error: class, interface, or enum expected
                        if (name.length == 2 && name[1] == '.')
                        ^
/tmp/jprt/P1/110621.albatem/s/jdk/src/solaris/classes/sun/nio/fs/SolarisUserDefinedFileAttributeView.java:264: error: class, interface, or enum expected
                    }
                    ^
/tmp/jprt/P1/110621.albatem/s/jdk/src/solaris/classes/sun/nio/fs/SolarisUserDefinedFileAttributeView.java:266: error: class, interface, or enum expected
                }
                ^
/tmp/jprt/P1/110621.albatem/s/jdk/src/solaris/classes/sun/nio/fs/SolarisUserDefinedFileAttributeView.java:269: error: class, interface, or enum expected
            }
            ^
/tmp/jprt/P1/110621.albatem/s/jdk/src/solaris/classes/sun/nio/fs/SolarisUserDefinedFileAttributeView.java:279: error: class, interface, or enum expected
        try {
        ^
/tmp/jprt/P1/110621.albatem/s/jdk/src/solaris/classes/sun/nio/fs/SolarisUserDefinedFileAttributeView.java:283: error: class, interface, or enum expected
            try {
            ^
/tmp/jprt/P1/110621.albatem/s/jdk/src/solaris/classes/sun/nio/fs/SolarisUserDefinedFileAttributeView.java:285: error: class, interface, or enum expected
            } finally {
            ^
/tmp/jprt/P1/110621.albatem/s/jdk/src/solaris/classes/sun/nio/fs/SolarisUserDefinedFileAttributeView.java:287: error: class, interface, or enum expected
            }
            ^
/tmp/jprt/P1/110621.albatem/s/jdk/src/solaris/classes/sun/nio/fs/SolarisUserDefinedFileAttributeView.java:290: error: class, interface, or enum expected
        }
        ^
83 errors
gmake[3]: *** [/tmp/jprt/P1/110621.albatem/s/build/solaris-sparc-normal-clientANDserver-release/jdk/classes/_the.batch] Error 1
gmake[3]: Leaving directory `/tmp/jprt/P1/110621.albatem/s/jdk/makefiles'
gmake[2]: *** [classes-only] Error 2
gmake[2]: Leaving directory `/tmp/jprt/P1/110621.albatem/s/jdk/makefiles'
make[1]: *** [jdk-only] Error 2
make[1]: Leaving directory `/tmp/jprt/P1/110621.albatem/s'
make: *** [bridgeBuild] Error 2
###########################################################