This Bugzilla instance is a read-only archive of historic NetBeans bug reports. To report a bug in NetBeans please follow the project's instructions for reporting issues.

View | Details | Raw Unified | Return to bug 236524
Collapse All | Expand All

(-)a/make/netbeans/nb-javac/nbproject/build-impl.xml (-3 / +8 lines)
Lines 170-176 Link Here
170 
        </condition>
 170 
        </condition>
171 
        <path id="endorsed.classpath.path" path="${endorsed.classpath}"/>
 171 
        <path id="endorsed.classpath.path" path="${endorsed.classpath}"/>
172 
        <condition else="" property="endorsed.classpath.cmd.line.arg" value="-Xbootclasspath/p:'${toString:endorsed.classpath.path}'">
 172 
        <condition else="" property="endorsed.classpath.cmd.line.arg" value="-Xbootclasspath/p:'${toString:endorsed.classpath.path}'">
173 
            <length length="0" string="${endorsed.classpath}" when="greater"/>
 173 
            <and>
174 
                <isset property="endorsed.classpath"/>
175 
                <not>
176 
                    <equals arg1="${endorsed.classpath}" arg2="" trim="true"/>
177 
                </not>
178 
            </and>
174 
        </condition>
 179 
        </condition>
175 
        <condition else="" property="javac.profile.cmd.line.arg" value="-profile ${javac.profile}">
 180 
        <condition else="" property="javac.profile.cmd.line.arg" value="-profile ${javac.profile}">
176 
            <isset property="profile.available"/>
 181 
            <isset property="profile.available"/>
Lines 827-833 Link Here
827 
                </pathconvert>
 832 
                </pathconvert>
828 
                <taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" classpath="${libs.CopyLibs.classpath}" name="copylibs"/>
 833 
                <taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" classpath="${libs.CopyLibs.classpath}" name="copylibs"/>
829 
                <copylibs compress="${jar.compress}" excludeFromCopy="${copylibs.excludes}" index="${jar.index}" indexMetaInf="${jar.index.metainf}" jarfile="${dist.jar}" manifest="@{manifest}" rebase="${copylibs.rebase}" runtimeclasspath="${run.classpath.without.build.classes.dir}">
 834 
                <copylibs compress="${jar.compress}" excludeFromCopy="${copylibs.excludes}" index="${jar.index}" indexMetaInf="${jar.index.metainf}" jarfile="${dist.jar}" manifest="@{manifest}" rebase="${copylibs.rebase}" runtimeclasspath="${run.classpath.without.build.classes.dir}">
830 
                    <fileset dir="${build.classes.dir}"/>
 835 
                    <fileset dir="${build.classes.dir}" excludes="${dist.archive.excludes}"/>
831 
                    <manifest>
 836 
                    <manifest>
832 
                        <attribute name="Class-Path" value="${jar.classpath}"/>
 837 
                        <attribute name="Class-Path" value="${jar.classpath}"/>
833 
                        <customize/>
 838 
                        <customize/>
Lines 839-845 Link Here
839 
    <target name="-init-presetdef-jar">
 844 
    <target name="-init-presetdef-jar">
840 
        <presetdef name="jar" uri="http://www.netbeans.org/ns/j2se-project/1">
 845 
        <presetdef name="jar" uri="http://www.netbeans.org/ns/j2se-project/1">
841 
            <jar compress="${jar.compress}" index="${jar.index}" jarfile="${dist.jar}">
 846 
            <jar compress="${jar.compress}" index="${jar.index}" jarfile="${dist.jar}">
842 
                <j2seproject1:fileset dir="${build.classes.dir}"/>
 847 
                <j2seproject1:fileset dir="${build.classes.dir}" excludes="${dist.archive.excludes}"/>
843 
            </jar>
 848 
            </jar>
844 
        </presetdef>
 849 
        </presetdef>
845 
    </target>
 850 
    </target>
(-)a/make/netbeans/nb-javac/nbproject/genfiles.properties (-2 / +2 lines)
Lines 4-8 Link Here
4 
# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
 4 
# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
5 
# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
 5 
# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
6 
nbproject/build-impl.xml.data.CRC32=0dbef76c
 6 
nbproject/build-impl.xml.data.CRC32=0dbef76c
7 
nbproject/build-impl.xml.script.CRC32=5523c4db
 7 
nbproject/build-impl.xml.script.CRC32=732cb6b1
8 
nbproject/build-impl.xml.stylesheet.CRC32=cdba79fa@1.68.0.46
 8 
nbproject/build-impl.xml.stylesheet.CRC32=5a01deb7@1.68.0.46
(-)a/src/share/classes/com/sun/tools/javac/comp/Flow.java (-1 / +2 lines)
Lines 1127-1133 Link Here
1127 
                        ctypes = ctypes.append(exc);
 1127 
                        ctypes = ctypes.append(exc);
1128 
                        if (types.isSameType(exc, syms.objectType))
 1128 
                        if (types.isSameType(exc, syms.objectType))
1129 
                            continue;
 1129 
                            continue;
1130 
                        checkCaughtType(l.head.pos(), exc, thrownInTry, caughtInTry);
 1130 
                        checkCaughtType(subClauses.size() > 1 ? ct.pos() : l.head.pos(),
1131 
                                exc, thrownInTry, caughtInTry);
1131 
                        caughtInTry = chk.incl(exc, caughtInTry);
 1132 
                        caughtInTry = chk.incl(exc, caughtInTry);
1132 
                    }
 1133 
                    }
1133 
                }
 1134 
                }

Return to bug 236524