WebSVN – DevTools – Diff – /buildtool/trunk/src/main/java/com/erggroup/buildtool/ripple/ReleaseManager.java

 import org.apache.log4j.Logger;
 import com.erggroup.buildtool.ripple.RunLevel.BuildState;
 import com.erggroup.buildtool.utilities.MutableDate;
-import com.erggroup.buildtool.utilities.MutableInt;
-import com.erggroup.buildtool.utilities.MutableString;
 /**Release Manager schema abstraction
  */
 public class ReleaseManager implements Cloneable
+{
             disconnect();
+        }
+    }
     /**executes the get_daemon_inst function with the passed parameters
-     * @param   rtagId          - Release to examine
-     * @param   opCode          - Type of instruction to process
+     * @param   di          - Daemon Instruction Control Data Information
-     * @param   instruction     - In/Out daemon instruction identifier Start scan from this instruction
-     * @param   pvId            - Returns Pvid from instruction
-     * @param   userId          - Returns userId of creator
+     *
-     * @param   userEmail       - Returns email address of userId
      * @return  true if an instruction exists - for use in a while loop
      */
-    private boolean getDaemonInst(final int rtagId, final int opCode,
+    public boolean getDaemonInst(DaemonInstruction di ) throws SQLException, Exception
-            MutableInt instruction, MutableInt pvId, MutableInt userId, MutableString userEmail ) throws SQLException, Exception
+    {
-        mLogger.debug("getDaemonInst " + instruction);
+        mLogger.debug("getDaemonInst " + di.instruction);
         boolean retVal = false;
         if ( mUseDatabase )
+        {
             try
+            {
-                CallableStatement stmt = mConnection.prepareCall( "begin ? := PK_BUILDAPI.GET_DAEMON_INST(?,?,?,?,?,?); end;" );
+                CallableStatement stmt = mConnection.prepareCall( "begin ? := PK_BUILDAPI.GET_DAEMON_INST(?,?,?,?,?,?,?); end;" );
                 stmt.registerOutParameter(1, Types.INTEGER);
                 stmt.registerOutParameter(3, Types.INTEGER);
                 stmt.registerOutParameter(4, Types.INTEGER);
                 stmt.registerOutParameter(5, Types.INTEGER);
                 stmt.registerOutParameter(6, Types.INTEGER);
                 stmt.registerOutParameter(7, Types.INTEGER);
-                stmt.setInt(2, rtagId );
+                stmt.setInt(2, di.rtag_id );
-                stmt.setInt( 3, instruction.value );
+                stmt.setInt( 3, di.instruction );
-                stmt.setInt( 4, opCode );
+                stmt.setInt( 4, di.opCode );
+                stmt.setInt(8, di.expired ? 1 : 0);
                 stmt.execute();
                 int result = stmt.getInt( 1 );
                 if ( result == 1 )
+                {
                     retVal = true;
-                    instruction.value = stmt.getInt( 3 );
+                    di.instruction = stmt.getInt( 3 );
-                    pvId.value = stmt.getInt( 5 );
+                    di.pvId = stmt.getInt( 5 );
-                    userId.value = stmt.getInt( 6 );
+                    di.userId = stmt.getInt( 6 );
                     //
                     //  Convert userId into an email address
                     //
                     CallableStatement stmt1 = mConnection.prepareCall(
-                            "select user_email from release_manager.users where user_id=" + userId.value);
+                            "select user_email from release_manager.users where user_id=" + di.userId);
                     ResultSet rset1 = stmt1.executeQuery();
                     while( rset1.next() )
+                    {
-                        userEmail.value = rset1.getString("user_email");
+                        di.userEmail = rset1.getString("user_email");
                         if (rset1.wasNull())
+                        {
-                            userEmail.value = "";
+                            di.userEmail = "";
+                        }
+                    }
                     rset1.close();
                     stmt1.close();
                 handleSQLException(e, "");
+            }
+        }
         return retVal;
+    }
     /** Mark a Daemon Instruction as in-progress
      *  Assumes that a database connection has been established
      *  Assumes that the connection is within a Mutex session and the database commit will be done elsewhere
+     *
      *  @param  instruction - PVID of the daemon instruction to process
             stmt.setFetchSize(10);
             stmt.setInt(1, rtag_id);
             stmt.setInt(2, rcon_id);
             stmt.setString(3, machine_hostname);
             stmt.setString(4, Character.toString(daemon_mode));
-            ResultSet rset = stmt.executeQuery();
+            RmResultSet rset = new RmResultSet(stmt.executeQuery(),"queryReleaseConfig 1");
             int rsetSize = 0;
             while( rset.next() )
+            {
                 rsetSize++;
                 //
                 //  Pause: null -> 0 == Run
                 //         1         == Pause
                 //         2         == Disabled
                 //
-                int pause = rset.getInt("pause");
+                int pause = rset.getInt("pause",0);
-                if ( rset.wasNull() )
-                {
-                    pause = 0;
-                }
-                //
-                //  build_age
-                //
-                int build_age = rset.getInt("build_age");
+                int build_age = rset.getInt("build_age", 0);
-                if ( rset.wasNull() )
-                {
-                    build_age = 0;
-                }
-                //
-                // days since last build
-                //
-                int days_since_last_build = rset.getInt("last_build_days");
+                int days_since_last_build = rset.getInt("last_build_days", 0);
-                if ( rset.wasNull() )
-                {
-                    days_since_last_build = 0;
-                }
                 //
                 //  Determine if we should disable the daemons on this release because they have not been
                 //  used in a long while.
                 //
                     "        and mt.gbe_id=bc.gbe_id" +
                     "        and mt.bm_id=bm.bm_id"
                     );
             stmt.setFetchSize(10);
             stmt.setInt(1, rtag_id);
-            ResultSet rset = stmt.executeQuery();
+            RmResultSet rset = new RmResultSet(stmt.executeQuery(),"queryReleaseConfig 2");
             while( rset.next() )
+            {
-                int rcon_id = rset.getInt("rcon_id");
+                int rcon_id = rset.mustGetInt("rcon_id");
-                if ( rset.wasNull() )
-                {
-                    mLogger.fatal("queryReleaseConfig 2 null rcon_id " + rtag_id);
-                    // show stopper
-                    throw new Exception("queryReleaseConfig 2 null rcon_id " + rtag_id);
-                }
                 char dm = 'S';
-                String daemon_mode = rset.getString("daemon_mode");
+                String daemon_mode = rset.getString("daemon_mode","S");
-                if ( daemon_mode != null )
-                {
-                    mLogger.info("queryReleaseConfig 2 daemon_mode " + daemon_mode + ".");
+                mLogger.info("queryReleaseConfig 2 daemon_mode " + daemon_mode + ".");
-                    if ( daemon_mode.compareTo("M") == 0 )
-                    {
-                        dm = 'M';
-                    }
-                }
-                String machine_hostname = rset.getString("machine_hostname");
-                if (machine_hostname == null)
-                {
-                    mLogger.fatal("queryReleaseConfig 2 null machine_hostname " + rtag_id);
-                    throw new Exception("queryReleaseConfig 2 null machine_hostname " + rtag_id);
-                }
-                String gbe_buildfilter = rset.getString("gbe_buildfilter");
-                String gbe_machtype = rset.getString("gbe_value");
-                if (gbe_machtype == null)
+                if ( daemon_mode.compareTo("M") == 0 )
+                {
-                    mLogger.fatal("queryReleaseConfig 2 null gbe_value " + rtag_id);
-                    throw new Exception("queryReleaseConfig 2 null gbe_value " + rtag_id);
-                }
+                    dm = 'M';
-                String gbe_machclass = rset.getString("bm_name");
-                if (gbe_machclass == null)
-                {
-                    mLogger.fatal("queryReleaseConfig 2 null bm_name " + rtag_id);
-                    throw new Exception("queryReleaseConfig 2 null bm_name " + rtag_id);
+                }
+                String machine_hostname = rset.mustGetString("machine_hostname");
+                String gbe_buildfilter = rset.getString("gbe_buildfilter","");
+                String gbe_machtype = rset.mustGetString("gbe_value");
+                String gbe_machclass = rset.mustGetString("bm_name");
                 //
                 //  Pause: null -> 0 == Run
                 //         1         == Pause
                 //         2         == Disabled
                 //
-                int pause = rset.getInt("pause");
+                int pause = rset.getInt("pause",0);
-                if ( rset.wasNull() )
-                {
-                    pause = 0;
-                }
                 mLogger.info("queryReleaseConfig 2: " + rtag_id + ", " + rcon_id + ", "+ dm + ", " + pause +
                         ", " + machine_hostname + ", " + gbe_buildfilter + ", " + gbe_machtype + ", + " + gbe_machclass );
                 //
                 // Daemon Mode : Do not include build daemons that are disabled
                     "      and (rt.official = 'N' or rt.official='R' or rt.official='C')"
                     );
             stmt.setFetchSize(20);
             stmt.setString(1, hostname);
-            ResultSet rset = stmt.executeQuery();
+            RmResultSet rset = new RmResultSet(stmt.executeQuery(),"queryReleaseConfig 3");
             while( rset.next() )
+            {
-                int rtag_id = rset.getInt("rtag_id");
+                int rtag_id = rset.mustGetKeyInt("rtag_id");
-                if ( rset.wasNull() )
-                {
-                    mLogger.fatal("queryReleaseConfig 3 null rtag_id");
-                    // show stopper
-                    throw new Exception("queryReleaseConfig 3 null rtag_id");
-                }
-                int rcon_id = rset.getInt("rcon_id");
+                int rcon_id = rset.mustGetInt("rcon_id");
-                if ( rset.wasNull() )
-                {
-                    mLogger.fatal("queryReleaseConfig 3 null rcon_id");
-                    throw new Exception("queryReleaseConfig 3 null rcon_id");
-                }
                 char dm = 'S';
-                String daemon_mode = rset.getString("daemon_mode");
+                String daemon_mode = rset.getString("daemon_mode", "S");
-                if ( daemon_mode != null )
-                {
-                    mLogger.info("queryReleaseConfig 3 daemon_mode " + daemon_mode + ".");
-                    if ( daemon_mode.compareTo("M") == 0 )
+                mLogger.info("queryReleaseConfig 3 daemon_mode " + daemon_mode + ".");
-                    {
-                        dm = 'M';
-                    }
-                }
-                String machine_hostname = rset.getString("machine_hostname");
-                if (machine_hostname == null)
+                if ( daemon_mode.compareTo("M") == 0 )
+                {
-                    mLogger.fatal("queryReleaseConfig 3 null machine_hostname " + rtag_id);
-                    throw new Exception("queryReleaseConfig 3 null machine_hostname " + rtag_id);
-                }
+                    dm = 'M';
-                String gbe_buildfilter = rset.getString("gbe_buildfilter");
-                String gbe_machtype = rset.getString("gbe_value");
-                if (gbe_machtype == null)
-                {
-                    mLogger.fatal("queryReleaseConfig 3 null gbe_value " + rtag_id);
-                    throw new Exception("queryReleaseConfig 3 null gbe_value " + rtag_id);
-                }
-                String gbe_machclass = rset.getString("bm_name");
-                if (gbe_machclass == null)
-                {
-                    mLogger.fatal("queryReleaseConfig 3 null bm_name " + rtag_id);
-                    throw new Exception("queryReleaseConfig 3 null bm_name " + rtag_id);
+                }
+                String machine_hostname = rset.mustGetString("machine_hostname");
+                String gbe_buildfilter = rset.getString("gbe_buildfilter",null);
+                String gbe_machtype = rset.mustGetString("gbe_value");
+                String gbe_machclass = rset.mustGetString("bm_name");
                 //
                 //  Pause: null -> 0 == Run
                 //         1         == Pause
                 //         2         == Disabled
                 //
-                int pause = rset.getInt("pause");
+                int pause = rset.getInt("pause",0);
-                if ( rset.wasNull() )
-                {
-                    pause = 0;
-                }
                 mLogger.info("queryReleaseConfig 3: " + rtag_id + ", " + rcon_id + ", "+ dm + ", " + pause +
                         ", " + machine_hostname + ", " + gbe_buildfilter + ", " + gbe_machtype + ", + " + gbe_machclass );
                 //
                 // Do not include build daemons that are disabled
      *    bsa_name="Debug"|"Production"|"Production and Debug"|"Java 1.4"|"Java 1.5"|"Java 1.6"
+     *
      * Overridden in ReleaseManagerUtf
+     *
      */
     protected void queryPackageVersions(
             RippleEngine rippleEngine,
             ArrayList<Package> packageCollection,
             int baseline) throws SQLException, Exception
+    {
                                 "   and pv.build_type='A' and pv.dlocked='A'" +
                                 "   and pv.pv_id=pl.pv_id and p.pkg_id=pv.pkg_id" +
                                 " order by pv.modified_stamp"
                         );
                 stmt1.setFetchSize(500);
-                ResultSet rset1 = stmt1.executeQuery();
+                RmResultSet rset1 = new RmResultSet(stmt1.executeQuery(), "queryPackageVersions rset1");
                 while( rset1.next() )
+                {
-                    int pv_id = rset1.getInt("pv_id");
+                    int pv_id = rset1.mustGetKeyInt("pv_id");
-                    if ( rset1.wasNull() )
-                    {
-                        mLogger.fatal("queryPackageVersions rset1 null pv_id");
-                        // show stopper
-                        throw new Exception("queryPackageVersions rset1 null pv_id");
-                    }
-                    int pkg_id = rset1.getInt("pkg_id");
+                    int pkg_id = rset1.mustGetInt("pkg_id");
-                    if ( rset1.wasNull() )
-                    {
-                        mLogger.fatal("queryPackageVersions rset1 null pkg_id " + pv_id);
-                        // show stopper
-                        throw new Exception("queryPackageVersions rset1 null pkg_id " + pv_id);
-                    }
-                    String pkg_name = rset1.getString("pkg_name");
+                    String pkg_name = rset1.mustGetString("pkg_name");
-                    if ( pkg_name == null )
-                    {
-                        mLogger.fatal("queryPackageVersions rset1 null pkg_name " + pv_id);
-                        // show stopper
-                        throw new Exception("queryPackageVersions rset1 null pkg_name " + pv_id);
-                    }
-                    String pkg_version = rset1.getString("pkg_version");
+                    String pkg_version = rset1.mustGetString("pkg_version");
-                    if (pkg_version == null)
-                    {
-                        mLogger.fatal("queryPackageVersions rset1 null pkg_version " + pv_id);
-                        // show stopper
-                        throw new Exception("queryPackageVersions rset1 null pkg_version " + pv_id);
-                    }
                     // Previous Version of this package, without the project suffix
                     String pkg_prevVersion = getBaseVersionNumber(pv_id);
                     if ( pkg_prevVersion == null)
+                    {
                         mLogger.fatal("queryPackageVersions. No Previous version" + pv_id);
                         // show stopper
                         throw new Exception("queryPackageVersions. No Previous version" + pv_id);
+                    }
-                    String v_ext = rset1.getString("v_ext");
+                    String v_ext = rset1.getString("v_ext","");
-                    if ( v_ext == null )
-                    {
-                        v_ext = "";
-                    }
-                    String change_type = rset1.getString("change_type");
+                    String change_type = rset1.getString("change_type", "P");
-                    if ( change_type == null )
-                    {
-                        change_type = "P";
-                    }
                     char ct = 'x';
                     if ( change_type.compareTo("M") == 0 )
+                    {
                         ct = 'F';
+                    }
                     if ( ct != 'x' )
+                    {
-                        String ripple_field = rset1.getString("ripple_field");
+                        String ripple_field = rset1.getString("ripple_field", "b");
-                        if ( ripple_field == null ||  ripple_field.length() == 0 )
-                        {
-                            ripple_field = "b";
-                        }
-                        int major_limit = rset1.getInt("major_limit");
+                        int major_limit = rset1.getInt("major_limit", 0);
-                        if ( rset1.wasNull() )
-                        {
-                            major_limit = 0;
-                        }
-                        int minor_limit = rset1.getInt("minor_limit");
+                        int minor_limit = rset1.getInt("minor_limit",0);
-                        if ( rset1.wasNull() )
-                        {
-                            minor_limit = 0;
-                        }
-                        int patch_limit = rset1.getInt("patch_limit");
+                        int patch_limit = rset1.getInt("patch_limit",0);
-                        if ( rset1.wasNull() )
-                        {
-                            patch_limit = 0;
-                        }
-                        int build_number_limit = rset1.getInt("build_number_limit");
+                        int build_number_limit = rset1.getInt("build_number_limit",0);
-                        if ( rset1.wasNull() )
-                        {
-                            build_number_limit = 0;
-                        }
-                        String vcs_tag = rset1.getString("vcsTag");
+                        String vcs_tag = rset1.getString("vcsTag", "");
-                        if ( vcs_tag == null )
-                        {
-                            vcs_tag = "";
-                        }
                         Package p = new Package(pkg_id, pv_id, pkg_name, pkg_version, v_ext, pkg_name + v_ext, vcs_tag, ripple_field.charAt(0), ct);
                         p.mDirectlyPlanned = true;
                         p.mBuildReason = BuildReason.NewVersion;
                         p.mMajorLimit = major_limit;
                                 "  and dpv.pv_id=pd.dpv_id"+
                                 "  and p.pkg_id=dpv.pkg_id " +
                                 " order by pv.modified_stamp"
                         );
                 stmt2.setFetchSize(500);
-                ResultSet rset2 = stmt2.executeQuery();
+                RmResultSet rset2 = new RmResultSet(stmt2.executeQuery(), "queryPackageVersions rset2");
                 while( rset2.next() )
+                {
                     boolean ignore = false;
-                    int pv_id = rset2.getInt("pv_id");
+                    int pv_id = rset2.mustGetKeyInt("pv_id");
-                    if ( rset2.wasNull() )
-                    {
-                        mLogger.fatal("queryPackageVersions rset2 null pv_id");
-                        // show stopper
-                        throw new Exception("queryPackageVersions rset2 null pv_id");
-                    }
                     Package p = findPackage(pv_id, packageCollection);
                     if ( p == NULL_PACKAGE )
+                    {
                         mLogger.info("queryPackageVersions rset2 package superceded by planned " + pv_id);
                         ignore = true;
+                    }
-                    String pkg_name = rset2.getString("pkg_name");
+                    String pkg_name = rset2.mustGetString("pkg_name");
-                    if ( pkg_name == null )
-                    {
-                        mLogger.fatal("queryPackageVersions rset2 null pkg_name " + pv_id);
-                        // show stopper
-                        throw new Exception("queryPackageVersions rset2 null pkg_name " + pv_id);
-                    }
-                    String v_ext = rset2.getString("v_ext");
+                    String v_ext = rset2.getString("v_ext","");
-                    if ( v_ext == null )
-                    {
-                        v_ext = "";
-                    }
                     if ( !ignore )
+                    {
                         p.mDependencyCollection.add(pkg_name + v_ext);
                         p.mDependencyIDCollection.add(-1);
+                    }
                                 "     and bm.bm_id=pbi.bm_id" +
                                 "     and bsa.bsa_id=pbi.bsa_id " +
                                 "order by pv.modified_stamp"
                         );
                 stmt3.setFetchSize(500);
-                ResultSet rset3 = stmt3.executeQuery();
+                RmResultSet rset3 = new RmResultSet(stmt3.executeQuery(), "queryPackageVersions rset3");
                 while( rset3.next() )
+                {
                     boolean ignore = false;
-                    int pv_id = rset3.getInt("pv_id");
+                    int pv_id = rset3.mustGetKeyInt("pv_id");
-                    if ( rset3.wasNull() )
-                    {
-                        mLogger.fatal("queryPackageVersions rset3 null pv_id");
-                        // show stopper
-                        throw new Exception("queryPackageVersions rset3 null pv_id");
-                    }
                     Package p = findPackage(pv_id, packageCollection);
                     if ( p == NULL_PACKAGE )
+                    {
                         mLogger.info("queryPackageVersions rset3 package superceded by planned " + pv_id);
                         ignore = true;
+                    }
-                    String bm_name = rset3.getString("bm_name");
+                    String bm_name = rset3.mustGetString("bm_name");
-                    if ( bm_name == null )
-                    {
-                        mLogger.fatal("queryPackageVersions rset3 null bm_name " + pv_id);
-                        // show stopper
-                        throw new Exception("queryPackageVersions rset3 null bm_name " + pv_id);
-                    }
-                    String bsa_name = rset3.getString("bsa_name");
+                    String bsa_name = rset3.mustGetString("bsa_name");
-                    if ( bsa_name == null )
-                    {
-                        mLogger.fatal("queryPackageVersions rset3 null bsa_name " + pv_id);
-                        // show stopper
-                        throw new Exception("queryPackageVersions rset3 null bsa_name " + pv_id);
-                    }
                     if ( !ignore )
+                    {
                         BuildStandard bs = new BuildStandard(rippleEngine, bm_name, bsa_name);
                         if ( bs.supportedBuildStandard() )
+                        {
                             p.mBuildStandardCollection.add(bs);
+                        }
+                    }
                         "  and ut.pv_id=pv.pv_id" +
                         "  and tt.test_type_id=ut.test_types_fk" +
                         " order by pv.modified_stamp"
                         );
                 stmt4.setFetchSize(500);
-                ResultSet rset4 = stmt4.executeQuery();
+                RmResultSet rset4 = new RmResultSet(stmt4.executeQuery(), "queryPackageVersions rset4");
                 while( rset4.next() )
+                {
                     boolean ignore = false;
-                    int pv_id = rset4.getInt("pv_id");
+                    int pv_id = rset4.mustGetKeyInt("pv_id");
-                    if ( rset4.wasNull() )
-                    {
-                        mLogger.fatal("queryPackageVersions rset4 null pv_id");
-                        // show stopper
-                        throw new Exception("queryPackageVersions rset4 null pv_id");
-                    }
                     Package p = findPackage(pv_id, packageCollection);
                     if ( p == NULL_PACKAGE )
+                    {
                         mLogger.info("queryPackageVersions rset4 package superceded by planned " + pv_id);
                         ignore = true;
+                    }
-                    String test_type_name = rset4.getString("test_type_name");
+                    String test_type_name = rset4.mustGetString("test_type_name");
-                    if ( test_type_name == null )
-                    {
-                        mLogger.fatal("queryPackageVersions rset4 null test_type_name " + pv_id);
-                        // show stopper
-                        throw new Exception("queryPackageVersions rset4 null test_type_name " + pv_id);
-                    }
                     if ( !ignore )
+                    {
                         if ( test_type_name.compareTo("Autobuild UTF") == 0 )
+                        {
                             p.mHasAutomatedUnitTests = true;
                                 "      and u.user_id=mg.user_id " +
                                 "      and af.proj_id=rt.proj_id " +
                                 " order by pv.modified_stamp"
                         );
                 stmt5.setFetchSize(500);
-                ResultSet rset5 = stmt5.executeQuery();
+                RmResultSet rset5 = new RmResultSet(stmt5.executeQuery(), "queryPackageVersions rset5");
                 while( rset5.next() )
+                {
-                    int pv_id = rset5.getInt("pv_id");
+                    int pv_id = rset5.mustGetKeyInt("pv_id");
-                    if ( rset5.wasNull() )
-                    {
-                        mLogger.fatal("queryPackageVersions rset5 null pv_id");
-                        // show stopper
-                        throw new Exception("queryPackageVersions rset5 null pv_id");
-                    }
                     Package p = findPackage(pv_id, packageCollection);
                     if ( p == NULL_PACKAGE )
+                    {
                         mLogger.info("queryPackageVersions rset5 package superceded by planned " + pv_id);
+                    }
                     else
+                    {
-                        String user_email = rset5.getString("user_email");
+                        String user_email = rset5.getString("user_email", null);
                         if ( user_email != null )
+                        {
                             p.addEmail(user_email);
+                        }
+                    }
                 rset5.close();
                 stmt5.close();
                 // get planned package build failure info...
                 // package version
-                mLogger.debug("queryPackageVersions: stmt51");
+                mLogger.debug("queryPackageVersions: stmt6");
                 phase.setPhase("getPlannedPkgs7");
-                PreparedStatement stmt51 = mConnection.prepareStatement(
+                PreparedStatement stmt6 = mConnection.prepareStatement(
                         "select pl.pv_id, u1.user_email, u2.user_email, u3.user_email, pv.modified_stamp" +
                         " from release_manager.planned pl," +
                         "      release_manager.release_tags rt," +
                         "      release_manager.package_versions pv," +
                         "      release_manager.users u1," +
                         "   and u1.user_id=pv.creator_id" +
                         "   and u2.user_id=pv.owner_id" +
                         "   and u3.user_id=pv.modifier_id" +
                         "   order by pv.modified_stamp"
                         );
-                stmt51.setFetchSize(500);
+                stmt6.setFetchSize(500);
-                ResultSet rset51 = stmt51.executeQuery();
+                RmResultSet rset6 = new RmResultSet(stmt6.executeQuery(), "queryPackageVersions rset6");
-                while( rset51.next() )
+                while( rset6.next() )
+                {
-                    int pv_id = rset51.getInt("pv_id");
+                    int pv_id = rset6.mustGetKeyInt("pv_id");
-                    if ( rset51.wasNull() )
-                    {
-                        mLogger.fatal("queryPackageVersions rset51 null pv_id");
-                        // show stopper
-                        throw new Exception("queryPackageVersions rset51 null pv_id");
-                    }
                     Package p = findPackage(pv_id, packageCollection);
                     if ( p == NULL_PACKAGE )
+                    {
-                        mLogger.info("queryPackageVersions rset51 package superceded by planned " + pv_id);
+                        mLogger.info("queryPackageVersions rset6 package superceded by planned " + pv_id);
+                    }
                     else
+                    {
                         // walk the 3 columns of user_email in the resultset
                         // columns 2, 3 and 4, all of the same name, respectively
                         for(int column=2; column<5; column++ )
+                        {
-                            String user_email = rset51.getString(column);
+                            String user_email = rset6.getString(column,null);
                             if ( user_email != null )
+                            {
                                 p.addEmail(user_email);
+                            }
+                        }
+                    }
+                }
-                rset51.close();
+                rset6.close();
-                stmt51.close();
+                stmt6.close();
                 // get planned package advisory ripple info
                 mLogger.debug("queryPackageVersions: stmt7");
                 phase.setPhase("getPlannedPkgs8");
                 PreparedStatement stmt7 = mConnection.prepareStatement(
                         "    and ar.rtag_id=pl.rtag_id" +
                         "    and ar.pv_id=pl.pv_id " +
                         " order by pv.modified_stamp"
                         );
                 stmt7.setFetchSize(500);
-                ResultSet rset7 = stmt7.executeQuery();
+                RmResultSet rset7 = new RmResultSet(stmt7.executeQuery(), "queryPackageVersions rset7");
                 while( rset7.next() )
+                {
                     boolean ignore = false;
-                    int pv_id = rset7.getInt("pv_id");
+                    int pv_id = rset7.mustGetInt("pv_id");
-                    if ( rset7.wasNull() )
-                    {
-                        mLogger.fatal("queryPackageVersions rset7 null pv_id");
-                        // show stopper
-                        throw new Exception("queryPackageVersions rset7 null pv_id");
-                    }
                     Package p = findPackage(pv_id, packageCollection);
                     if ( p == NULL_PACKAGE )
+                    {
                         mLogger.info("queryPackageVersions rset7 package superceded by planned " + pv_id);
                         ignore = true;
+                    }
+                    }
+                }
                 rset7.close();
                 stmt7.close();
+                //  Process Scheduled Build Approvals. OpCode is 2
+                //      These are treated as requests to not-include a 'Pending' package-version in the current build set
+                //      If there is an un-expired instruction, then remove the pending package-version from the build set
+                //
+                //  Process all expired requests
+                //      These are scheduled builds were the scheduled time has been exceeded
+                //      Simply discard the instruction and let the Approved build proceed
+                //
+                DaemonInstruction di = new DaemonInstruction(baseline, 2, true);
+                phase.setPhase("removeOldSchedBuilds");
+                while ( getDaemonInst( di ) )
+                {
+                    markDaemonInstCompleted(di.instruction);
+                    mLogger.info("queryPackageVersions remove Scheduled Build Approvals " + di.pvId);
+                }
+                phase.setPhase("getSchedBuilds");
+                di = new DaemonInstruction(baseline, 2, false);
+                while ( getDaemonInst( di ) )
+                {
+                    Package p = findPackage(di.pvId, packageCollection);
+                    if ( p != NULL_PACKAGE )
+                    {
+                        mLogger.info("queryPackageVersions Scheduled Build Approvals " + di.pvId);
+                        packageCollection.remove(p);
+                    }
+                    else
+                    {
+                        // discard - the package no longer exists
+                        markDaemonInstCompleted( di.instruction );
+                        mLogger.info("queryPackageVersions remove Scheduled Build Approvals for nonexistent package " + di.pvId);
+                    }
+                }
                 // get released package info
                 //    Get package information on ALL released packages within the release of interest
                 //
                 mLogger.debug("queryPackageVersions: stmt8");
                                 " AND peg.pv_id(+) = rc.pv_id" +
                                 " ORDER BY rc.pv_id"
                         );
                 mLogger.debug("queryPackageVersions: stmt8 Prepared");
                 stmt8.setFetchSize(1000);
-                ResultSet rset8 = stmt8.executeQuery();
+                RmResultSet rset8 = new RmResultSet(stmt8.executeQuery(), "queryPackageVersions rset8");
                 mLogger.debug("queryPackageVersions: stmt8 Query Done");
                 while( rset8.next() )
+                {
-                    int pv_id = rset8.getInt("pv_id");
+                    int pv_id = rset8.mustGetKeyInt("pv_id");
-                    if ( rset8.wasNull() )
-                    {
-                        mLogger.fatal("queryPackageVersions rset8 null pv_id");
-                        // show stopper
-                        throw new Exception("queryPackageVersions rset8 null pv_id");
-                    }
-                    int pkg_id = rset8.getInt("pkg_id");
+                    int pkg_id = rset8.mustGetInt("pkg_id");
-                    if ( rset8.wasNull() )
-                    {
-                        mLogger.fatal("queryPackageVersions rset8 null pkg_id " + pv_id);
-                        // show stopper
-                        throw new Exception("queryPackageVersions rset8 null pkg_id " + pv_id);
-                    }
-                    String pkg_name = rset8.getString("pkg_name");
+                    String pkg_name = rset8.mustGetString("pkg_name");
-                    if ( pkg_name == null )
-                    {
-                        mLogger.fatal("queryPackageVersions rset8 null pkg_name " + pv_id);
-                        // show stopper
-                        throw new Exception("queryPackageVersions rset8 null pkg_name " + pv_id);
-                    }
-                    String pkg_version = rset8.getString("pkg_version");
+                    String pkg_version = rset8.mustGetString("pkg_version");
-                    if ( pkg_version == null )
-                    {
-                        mLogger.fatal("queryPackageVersions rset8 null pkg_version " + pv_id);
-                        // show stopper
-                        throw new Exception("queryPackageVersions rset8 null pkg_version " + pv_id);
-                    }
-                    String v_ext = rset8.getString("v_ext");
+                    String v_ext = rset8.getString("v_ext", "");
-                    if ( v_ext == null )
-                    {
-                        v_ext = "";
-                    }
-                    String ripple_field = rset8.getString("ripple_field");
+                    String ripple_field = rset8.getString("ripple_field", "b");
-                    if ( ripple_field == null || ripple_field.length() == 0 )
-                    {
-                        ripple_field = "b";
-                    }
-                    int major_limit = rset8.getInt("major_limit");
+                    int major_limit = rset8.getInt("major_limit",0);
-                    if ( rset8.wasNull() )
-                    {
-                        major_limit = 0;
-                    }
-                    int minor_limit = rset8.getInt("minor_limit");
+                    int minor_limit = rset8.getInt("minor_limit", 0);
-                    if ( rset8.wasNull() )
-                    {
-                        minor_limit = 0;
-                    }
-                    int patch_limit = rset8.getInt("patch_limit");
+                    int patch_limit = rset8.getInt("patch_limit",0);
-                    if ( rset8.wasNull() )
-                    {
-                        patch_limit = 0;
-                    }
-                    int build_number_limit = rset8.getInt("build_number_limit");
+                    int build_number_limit = rset8.getInt("build_number_limit", 0);
-                    if ( rset8.wasNull() )
-                    {
-                        build_number_limit = 0;
-                    }
-                    String vcs_tag = rset8.getString("vcsTag");
+                    String vcs_tag = rset8.getString("vcsTag","");
-                    if ( vcs_tag == null )
-                    {
-                        vcs_tag = "";
-                    }
-                    int isAnSdk = rset8.getInt("sdktag_id");
+                    int isAnSdk = rset8.getInt("sdktag_id",0);
-                    if ( rset8.wasNull() )
-                    {
-                        isAnSdk = 0;
-                    }
-                    int isPegged = rset8.getInt("pegged");
+                    int isPegged = rset8.getInt("pegged",0);
-                    if ( rset8.wasNull() )
-                    {
-                        isPegged = 0;
-                    }
-                    String buildType = rset8.getString("build_type");
+                    String buildType = rset8.getString("build_type", null);
                     boolean isBuildable = ( buildType != null ) && (buildType.equals("A") || buildType.equals("Y") );
-                    String rippleStopData = rset8.getString("ripple_stop");
+                    String rippleStopData = rset8.getString("ripple_stop","n");
-                    char rippleStop = 'n';
-                    if ( ! rset8.wasNull() ) {
-                        rippleStop =  rippleStopData.charAt(0);
+                    char rippleStop = rippleStopData.charAt(0);
-                    }
                     Package p = new Package(pkg_id, pv_id, pkg_name, pkg_version, v_ext, pkg_name + v_ext, vcs_tag, ripple_field.charAt(0));
                     p.mMajorLimit = major_limit;
                     p.mMinorLimit = minor_limit;
                     p.mPatchLimit = patch_limit;
                 // get released package dependency info
                 //
                 mLogger.debug("queryPackageVersions: stmt9");
                 phase.setPhase("getAllPkgs2");
                 PreparedStatement stmt9 = mConnection.prepareStatement(
-                        "select rc.pv_id, dpv.pv_id, p.pkg_name, dpv.v_ext" +
+                        "select rc.pv_id as pv_id, dpv.pv_id as dpv_id, p.pkg_name, dpv.v_ext" +
                                 " from release_manager.release_content rc," +
                                 "      release_manager.package_versions pv," +
                                 "      release_manager.package_dependencies pd,"+
                                 "      release_manager.package_versions dpv,"+
                                 "      release_manager.packages p" +
                                 "  and p.pkg_id=dpv.pkg_id" +
                                 " order by rc.pv_id"
                         );
                 mLogger.debug("queryPackageVersions: stmt9 prepared");
                 stmt9.setFetchSize(1000);
-                ResultSet rset9 = stmt9.executeQuery();
+                RmResultSet rset9 = new RmResultSet(stmt9.executeQuery(), "queryPackageVersions rset9");
                 mLogger.debug("queryPackageVersions: stmt9 query done");
                 while( rset9.next() )
+                {
                     boolean ignore = false;
-                    int pv_id = rset9.getInt(1);
+                    int pv_id = rset9.mustGetKeyInt("pv_id");
-                    if ( rset9.wasNull() )
-                    {
-                        mLogger.fatal("queryPackageVersions rset9 null pv_id");
-                        // show stopper
-                        throw new Exception("queryPackageVersions rset9 null pv_id");
-                    }
-                    int dpv_id = rset9.getInt(2);
+                    int dpv_id = rset9.mustGetInt("dpv_id");
-                    if ( rset9.wasNull() )
-                    {
-                        mLogger.fatal("queryPackageVersions rset9 null dpv_id " + pv_id);
-                        // show stopper
-                        throw new Exception("queryPackageVersions rset9 null dpv_id " + pv_id);
-                    }
                     Package p = findPackage(pv_id, packageCollection);
                     if ( p == NULL_PACKAGE )
+                    {
                         mLogger.info("queryPackageVersions rset9 package superceded by planned " + pv_id);
                         ignore = true;
+                    }
-                    String pkg_name = rset9.getString("pkg_name");
+                    String pkg_name = rset9.mustGetString("pkg_name");
-                    if ( pkg_name == null )
-                    {
-                        mLogger.fatal("queryPackageVersions rset9 null pkg_name " + pv_id);
-                        // show stopper
-                        throw new Exception("queryPackageVersions rset9 null pkg_name " + pv_id);
-                    }
-                    String v_ext = rset9.getString("v_ext");
+                    String v_ext = rset9.getString("v_ext","");
-                    if ( v_ext == null )
-                    {
-                        v_ext = "";
-                    }
                     if ( !ignore )
+                    {
                         p.mDependencyCollection.add(pkg_name + v_ext);
                         p.mDependencyIDCollection.add(dpv_id);
                                 "     and bsa.bsa_id=pbi.bsa_id " +
                                 "order by rc.pv_id"
                         );
                 stmt10.setFetchSize(1000);
                 stmt10.setInt(1, baseline);
-                ResultSet rset10 = stmt10.executeQuery();
+                RmResultSet rset10 = new RmResultSet(stmt10.executeQuery(), "queryPackageVersions rset10");
                 while( rset10.next() )
+                {
                     boolean ignore = false;
-                    int pv_id = rset10.getInt("pv_id");
+                    int pv_id = rset10.mustGetKeyInt("pv_id");
-                    if ( rset10.wasNull() )
-                    {
-                        mLogger.fatal("queryPackageVersions rset10 null pv_id");
-                        // show stopper
-                        throw new Exception("queryPackageVersions rset10 null pv_id");
-                    }
                     Package p = findPackage(pv_id, packageCollection);
                     if ( p == NULL_PACKAGE )
+                    {
                         mLogger.info("queryPackageVersions rset10 package superceded by planned " + pv_id);
                         ignore = true;
+                    }
-                    String bm_name = rset10.getString("bm_name");
+                    String bm_name = rset10.mustGetString("bm_name");
-                    if ( bm_name == null )
-                    {
-                        mLogger.fatal("queryPackageVersions rset10 null bm_name " + pv_id);
-                        // show stopper
-                        throw new Exception("queryPackageVersions rset10 null bm_name " + pv_id);
-                    }
-                    String bsa_name = rset10.getString("bsa_name");
+                    String bsa_name = rset10.mustGetString("bsa_name");
-                    if ( bsa_name == null )
-                    {
-                        mLogger.fatal("queryPackageVersions rset10 null bsa_name " + pv_id);
-                        // show stopper
-                        throw new Exception("queryPackageVersions rset10 null bsa_name " + pv_id);
-                    }
                     if ( !ignore )
+                    {
                         BuildStandard bs = new BuildStandard(rippleEngine, bm_name, bsa_name);
                                 "where rc.rtag_id=" + baseline +
                                 " and pv.pv_id = rc.pv_id and ut.pv_id=pv.pv_id and tt.test_type_id=ut.test_types_fk " +
                                 "order by rc.pv_id"
                         );
                 stmt11.setFetchSize(1000);
-                ResultSet rset11 = stmt11.executeQuery();
+                RmResultSet rset11 = new RmResultSet(stmt11.executeQuery(), "queryPackageVersions rset11");
                 while( rset11.next() )
+                {
                     boolean ignore = false;
-                    int pv_id = rset11.getInt("pv_id");
+                    int pv_id = rset11.mustGetKeyInt("pv_id");
-                    if ( rset11.wasNull() )
-                    {
-                        mLogger.fatal("queryPackageVersions rset11 null pv_id");
-                        // show stopper
-                        throw new Exception("queryPackageVersions rset11 null pv_id");
-                    }
                     Package p = findPackage(pv_id, packageCollection);
                     if ( p == NULL_PACKAGE )
+                    {
                         mLogger.info("queryPackageVersions rset11 package superceded by planned " + pv_id);
                         ignore = true;
+                    }
-                    String test_type_name = rset11.getString("test_type_name");
+                    String test_type_name = rset11.mustGetString("test_type_name");
-                    if ( test_type_name == null )
-                    {
-                        mLogger.fatal("queryPackageVersions rset11 null test_type_name " + pv_id);
-                        // show stopper
-                        throw new Exception("queryPackageVersions rset11 null test_type_name " + pv_id);
-                    }
                     if ( !ignore )
+                    {
                         if ( test_type_name.compareTo("Autobuild UTF") == 0 )
+                        {
                             p.mHasAutomatedUnitTests = true;
                         " AND u.user_id        = mg.user_id" +
                         " AND af.proj_id       = rt.proj_id" +
                         " ORDER BY rc.pv_id"
                         );
                 stmt12.setFetchSize(1000);
-                ResultSet rset12 = stmt12.executeQuery();
+                RmResultSet rset12 = new RmResultSet(stmt12.executeQuery(), "queryPackageVersions rset12");
                 while( rset12.next() )
+                {
-                    int pv_id = rset12.getInt("pv_id");
+                    int pv_id = rset12.mustGetKeyInt("pv_id");
-                    if ( rset12.wasNull() )
-                    {
-                        mLogger.fatal("queryPackageVersions rset12 null pv_id");
-                        // show stopper
-                        throw new Exception("queryPackageVersions rset12 null pv_id");
-                    }
                     Package p = findPackage(pv_id, packageCollection);
                     if ( p == NULL_PACKAGE )
+                    {
                         mLogger.info("queryPackageVersions rset12 package superceded by planned " + pv_id);
+                    }
                     else
+                    {
-                        String user_email = rset12.getString("user_email");
+                        String user_email = rset12.getString("user_email",null);
                         if ( user_email != null )
+                        {
                             p.addEmail(user_email);
+                        }
                                 "where rc.rtag_id=" + baseline +
                                 " and pv.pv_id = rc.pv_id and ar.rtag_id=rc.rtag_id and ar.pv_id=rc.pv_id " +
                                 "order by rc.pv_id"
                         );
                 stmt14.setFetchSize(1000);
-                ResultSet rset14 = stmt14.executeQuery();
+                RmResultSet rset14 = new RmResultSet(stmt14.executeQuery(), "queryPackageVersions rset14");
                 while( rset14.next() )
+                {
                     boolean ignore = false;
-                    int pv_id = rset14.getInt("pv_id");
+                    int pv_id = rset14.mustGetInt("pv_id");
-                    if ( rset14.wasNull() )
-                    {
-                        mLogger.fatal("queryPackageVersions rset14 null pv_id");
-                        // show stopper
-                        throw new Exception("queryPackageVersions rset14 null pv_id");
-                    }
                     Package p = findPackage(pv_id, packageCollection);
                     if ( p == NULL_PACKAGE )
+                    {
                         mLogger.info("queryPackageVersions rset14 package superceded by planned " + pv_id);
                         ignore = true;
+                    }
                 rset14.close();
                 stmt14.close();
                 // Daemon Instruction: Force Package Ripple
                 //  An op code of 0 means force ripple
-                MutableInt instruction = new MutableInt(0);
-                MutableInt pvid = new MutableInt(0);
-                MutableInt userid = new MutableInt(0);
-                MutableString userEmail = new MutableString();
                 phase.setPhase("getDaemonInstructions1");
-                while ( getDaemonInst( baseline, 0, instruction, pvid, userid, userEmail ) )
+                di = new DaemonInstruction( baseline, 0, true);
+                while ( getDaemonInst( di ) )
+                {
-                    Package p = findPackage(pvid.value, packageCollection);
+                    Package p = findPackage(di.pvId, packageCollection);
                     if ( p != NULL_PACKAGE )
+                    {
-                        mLogger.info("queryPackageVersions forced ripple data " + pvid.value);
+                        mLogger.info("queryPackageVersions forced ripple data " + di.pvId);
-                        p.mForcedRippleInstruction = instruction.value;
+                        p.mForcedRippleInstruction = di.instruction;
-                        p.mTestBuildEmail = userEmail.value;
+                        p.mTestBuildEmail = di.userEmail;
+                    }
                     else
+                    {
                         // discard
-                        markDaemonInstCompleted( instruction.value );
+                        markDaemonInstCompleted( di.instruction );
+                    }
+                }
                 // Daemon Instruction: Test Build Package
                 //  An op code of 1 means test build
                 // of the snapshot of build information that applied to the build and store in:
                 // - mTestBuildEmailBody
                 mLogger.debug("queryPackageVersions: stmt141");
                 phase.setPhase("getTestBuild1");
-                instruction.value = 0;
+                di = new DaemonInstruction( baseline, 1, true);
-                while ( getDaemonInst( baseline, 1, instruction, pvid, userid, userEmail ) )
+                while ( getDaemonInst( di ) )
+                {
                     // can only do one test build at a time - others will be discarded until future cycle
-                    mLogger.info("queryPackageVersions test build data " + pvid.value);
+                    mLogger.info("queryPackageVersions test build data " + di.pvId);
-                    int testBuildPvId = pvid.value;
+                    int testBuildPvId = di.pvId;
-                    int testBuildInstruction = instruction.value;
+                    int testBuildInstruction = di.instruction;
-                    String testBuildEmail = userEmail.value;
+                    String testBuildEmail = di.userEmail;
                     String pkg_name = "";
                     String pkg_ext = "";
                     String testBuildVcsTag = "null";
                     int pkg_id = 0;
                                     "release_manager.packages p" +
                                     " where pv.pv_id=" + testBuildPvId +
                                     " and p.pkg_id=pv.pkg_id "
                             );
                     stmt15.setFetchSize(10);
-                    ResultSet rset15 = stmt15.executeQuery();
+                    RmResultSet rset15 = new RmResultSet(stmt15.executeQuery(), "queryPackageVersions rset15");
                     int rsetSize = 0;
                     while( rset15.next() )
+                    {
                         rsetSize++;
-                        pkg_name = rset15.getString("pkg_name");
+                        pkg_name = rset15.mustGetKeyString("pkg_name");
-                        if ( pkg_name == null )
-                        {
-                            mLogger.fatal("queryPackageVersions rset15 null pkg_name " + testBuildPvId);
-                            // show stopper
-                            throw new Exception("queryPackageVersions rset15 null pkg_name " + testBuildPvId);
-                        }
-                        pkg_id = rset15.getInt("pkg_id");
+                        pkg_id = rset15.mustGetInt("pkg_id");
-                        if ( rset15.wasNull() )
-                        {
-                            mLogger.fatal("queryPackageVersions rset15 null pkg_id " + testBuildPvId);
-                            // show stopper
-                            throw new Exception("queryPackageVersions rset15 null pkg_id " + testBuildPvId);
-                        }
-                        pkg_ext = rset15.getString("v_ext");
+                        pkg_ext = rset15.getString("v_ext","");
-                        if ( pkg_ext == null )
-                        {
-                            pkg_ext = "";
-                        }
-                        testBuildVcsTag = rset15.getString("vcsTag");
+                        testBuildVcsTag = rset15.getString("vcsTag", "null");
-                        if ( testBuildVcsTag == null )
-                        {
-                            testBuildVcsTag = "null";
-                        }
+                    }
                     rset15.close();
                     stmt15.close();
                     mLogger.debug("queryPackageVersions: stmt16");
                     if ( rsetSize == 0 )
+                    {
-                        mLogger.error("queryPackageVersions rset15 no data found " + instruction.value);
+                        mLogger.error("queryPackageVersions rset15 no data found " + di.instruction);
-                        markDaemonInstCompleted( instruction.value );
+                        markDaemonInstCompleted( di.instruction );
+                    }
                     else
+                    {
                         Package q = findPackage(pkg_name + pkg_ext, packageCollection);
                                         "   and pd.pv_id=" + testBuildPvId +
                                         "   and dpv.pv_id=pd.dpv_id"+
                                         "   and p.pkg_id=dpv.pkg_id"
                                 );
                         stmt16.setFetchSize(1000);
-                        ResultSet rset16 = stmt16.executeQuery();
+                        RmResultSet rset16 = new RmResultSet(stmt16.executeQuery(), "queryPackageVersions rset16");
                         while( rset16.next() )
+                        {
-                            String dpkg_name = rset16.getString("pkg_name");
+                            String dpkg_name = rset16.mustGetString("pkg_name");
-                            if ( dpkg_name == null )
-                            {
-                                mLogger.fatal("queryPackageVersions rset16 null pkg_name " + testBuildPvId);
-                                // show stopper
-                                throw new Exception("queryPackageVersions rset16 null pkg_name " + testBuildPvId);
-                            }
-                            String v_ext = rset16.getString("v_ext");
+                            String v_ext = rset16.getString("v_ext", "");
-                            if ( v_ext == null )
-                            {
-                                v_ext = "";
-                            }
                             q.mTestBuildDependencyCollection.add(dpkg_name + v_ext);
+                        }
                         rset16.close();
                         stmt16.close();
                                         "where pv.pv_id=" + testBuildPvId +
                                         "   and pbi.pv_id=pv.pv_id" +
                                         "   and bm.bm_id=pbi.bm_id" +
                                         "   and bsa.bsa_id=pbi.bsa_id"
                                 );
-                        ResultSet rset17 = stmt17.executeQuery();
+                        RmResultSet rset17 = new RmResultSet(stmt17.executeQuery(), "queryPackageVersions rset17");
                         while( rset17.next() )
+                        {
-                            String bm_name = rset17.getString("bm_name");
+                            String bm_name = rset17.mustGetKeyString("bm_name");
-                            if ( bm_name == null )
-                            {
-                                mLogger.fatal("queryPackageVersions rset17 null bm_name " + testBuildPvId);
-                                // show stopper
-                                throw new Exception("queryPackageVersions rset17 null bm_name " + testBuildPvId);
-                            }
-                            String bsa_name = rset17.getString("bsa_name");
+                            String bsa_name = rset17.mustGetString("bsa_name");
-                            if ( bsa_name == null )
-                            {
-                                mLogger.fatal("queryPackageVersions rset17 null bsa_name " + testBuildPvId);
-                                // show stopper
-                                throw new Exception("queryPackageVersions rset17 null bsa_name " + testBuildPvId);
-                            }
                             BuildStandard bs = new BuildStandard(rippleEngine, bm_name, bsa_name);
                             if ( bs.supportedBuildStandard() )
+                            {
                                 "  from release_manager.unit_tests ut," +
                                 "       release_manager.test_types tt" +
                                 " where ut.pv_id=" + testBuildPvId +
                                 "  and tt.test_type_id=ut.test_types_fk"
                                 );
-                        ResultSet rset18 = stmt18.executeQuery();
+                        RmResultSet rset18 = new RmResultSet(stmt18.executeQuery(), "queryPackageVersions rset18");
                         while( rset18.next() )
+                        {
                             boolean ignore = false;
-                            String test_type_name = rset18.getString("test_type_name");
+                            String test_type_name = rset18.mustGetString("test_type_name");
-                            if ( test_type_name == null )
-                            {
-                                mLogger.fatal("queryPackageVersions rset18 null test_type_name " + testBuildPvId);
-                                // show stopper
-                                throw new Exception("queryPackageVersions rset18 null test_type_name " + testBuildPvId);
-                            }
                             if ( !ignore )
+                            {
                                 if ( test_type_name.compareTo("Autobuild UTF") == 0 )
+                                {
                         rset18.close();
                         stmt18.close();
+                    }
+                }
+            }
             else
+            {
                 // Escrow Mode
                 // get released product info
                                 " and pv.pv_id=oc.prod_id" +
                                 " and p.pkg_id=pv.pkg_id" +
                                 " order by oc.prod_id"
                         );
                 stmt.setFetchSize(1000);
-                ResultSet rset = stmt.executeQuery();
+                RmResultSet rset = new RmResultSet(stmt.executeQuery(), "queryPackageVersions rset");
                 while( rset.next() )
+                {
-                    int pv_id = rset.getInt("prod_id");
+                    int pv_id = rset.mustGetKeyInt("prod_id");
-                    if ( rset.wasNull() )
-                    {
-                        mLogger.fatal("queryPackageVersions rset null prod_id");
-                        // show stopper
-                        throw new Exception("queryPackageVersions rset null prod_id");
-                    }
-                    String pkg_name = rset.getString("pkg_name");
+                    String pkg_name = rset.mustGetString("pkg_name");
-                    if ( pkg_name == null )
-                    {
-                        mLogger.fatal("queryPackageVersions rset null pkg_name " + pv_id);
-                        // show stopper
-                        throw new Exception("queryPackageVersions rset null pkg_name " + pv_id);
-                    }
-                    String pkg_version = rset.getString("pkg_version");
+                    String pkg_version = rset.mustGetString("pkg_version");
-                    if ( pkg_version == null )
-                    {
-                        mLogger.fatal("queryPackageVersions rset null pkg_version " + pv_id);
-                        // show stopper
-                        throw new Exception("queryPackageVersions rset null pkg_version " + pv_id);
-                    }
-                    String v_ext = rset.getString("v_ext");
+                    String v_ext = rset.getString("v_ext", "");
-                    if ( v_ext == null )
-                    {
-                        v_ext = "";
-                    }
-                    String vcs_tag = rset.getString("vcsTag");
+                    String vcs_tag = rset.getString("vcsTag","");
-                    if ( vcs_tag == null )
-                    {
-                        vcs_tag = "";
-                    }
                     Package p = findPackage(pv_id, packageCollection);
                     if ( p == NULL_PACKAGE )
+                    {
                         Package q = new Package(0, pv_id, pkg_name, pkg_version, v_ext, pkg_name + "." + pkg_version, vcs_tag, 'x');
                         packageCollection.add(q);
+                    }
                                 "   and pd.pv_id=pv.pv_id" +
                                 "   and dpv.pv_id=pd.dpv_id" +
                                 "   and p.pkg_id=dpv.pkg_id" +
                         " order by pv.pv_id");
                 stmt.setFetchSize(1000);
-                ResultSet rset = stmt.executeQuery();
+                RmResultSet rset = new RmResultSet(stmt.executeQuery(),"traverseDependencies");
                 while (rset.next())
+                {
-                    int pv_id = rset.getInt("pv_id");
+                    int pv_id = rset.mustGetKeyInt("pv_id");
-                    if (rset.wasNull())
-                    {
-                        mLogger.fatal("traverseDependencies null pv_id");
-                        // show stopper
-                        throw new Exception("traverseDependencies null pv_id");
-                    }
-                    String pkg_name = rset.getString("pkg_name");
+                    String pkg_name = rset.mustGetString("pkg_name");
-                    if (pkg_name == null)
-                    {
-                        mLogger.fatal("traverseDependencies null pkg_name " + pv_id);
-                        // show stopper
-                        throw new Exception("traverseDependencies null pkg_name " + pv_id);
-                    }
-                    String pkg_version = rset.getString("pkg_version");
+                    String pkg_version = rset.mustGetString("pkg_version");
-                    if (pkg_version == null)
-                    {
-                        mLogger.fatal("traverseDependencies null pkg_version " + pv_id);
-                        // show stopper
-                        throw new Exception("traverseDependencies null pkg_version " + pv_id);
-                    }
-                    String v_ext = rset.getString("v_ext");
+                    String v_ext = rset.getString("v_ext","");
-                    if (v_ext == null)
-                    {
-                        v_ext = "";
-                    }
-                    String vcs_tag = rset.getString("vcsTag");
+                    String vcs_tag = rset.getString("vcsTag","");
-                    if (vcs_tag == null)
-                    {
-                        vcs_tag = "";
-                    }
                     Package p = new Package(0, pv_id, pkg_name, pkg_version, v_ext, pkg_name + "." + pkg_version, vcs_tag, 'x');
                     resultset.add(p);
                     pkg.mDependencyCollection.add(p.mAlias);
+                }
                     + "where pv.pv_id=" + p.mId
                     + "   and pbi.pv_id=pv.pv_id"
                     + "   and bm.bm_id=pbi.bm_id"
                     + "   and bsa.bsa_id=pbi.bsa_id "
                     + "order by pv.pv_id");
-            ResultSet rset = stmt.executeQuery();
+            RmResultSet rset = new RmResultSet (stmt.executeQuery(),"queryBuildInfo");
             while (rset.next())
+            {
-                String bm_name = rset.getString("bm_name");
+                String bm_name = rset.mustGetKeyString("bm_name");
-                if (bm_name == null)
-                {
-                    mLogger.fatal("queryBuildInfo null bm_name " + p.mId);
-                    // show stopper
-                    throw new Exception("queryBuildInfo null bm_name " + p.mId);
-                }
-                String bsa_name = rset.getString("bsa_name");
+                String bsa_name = rset.mustGetString("bsa_name");
-                if (bsa_name == null)
-                {
-                    mLogger.fatal("queryBuildInfo null bsa_name " + p.mId);
-                    // show stopper
-                    throw new Exception("queryBuildInfo null bsa_name " + p.mId);
-                }
                 BuildStandard bs = new BuildStandard(rippleEngine, bm_name, bsa_name);
                 if (bs.supportedBuildStandard())
+                {
             PreparedStatement stmt = mConnection.prepareStatement(
                     "select pv_id, root_pv_id, root_cause" +
                     " from release_manager.do_not_ripple" +
                     " where rtag_id=" + baseline);
             stmt.setFetchSize(1000);
-            ResultSet rset = stmt.executeQuery();
+            RmResultSet rset = new RmResultSet(stmt.executeQuery(),"queryBuildExclusions");
             while( rset.next() )
+            {
-                int pvId = rset.getInt("pv_id");
+                int pvId = rset.mustGetKeyInt("pv_id");
-                if ( rset.wasNull() )
-                {
-                    // show stopper
-                    mLogger.fatal("queryBuildExclusions rset null pv_id");
-                    throw new Exception("queryBuildExclusions rset null pv_id");
-                }
-                int rootPvId = rset.getInt("root_pv_id");
+                int rootPvId = rset.getInt("root_pv_id", -1);
-                if ( rset.wasNull() )
-                {
-                    // quite acceptable
-                    rootPvId = -1;
-                }
-                // again, a null root_cause is quite acceptable
-                String rootCause = rset.getString("root_cause");
+                String rootCause = rset.getString("root_cause", null);
                 // force email notification by using a zero test build instruction
                 BuildExclusion buildExclusion = new BuildExclusion(pvId, rootPvId, rootCause, 0);
                 buildExclusionCollection.add(buildExclusion);
+            }
                     "     release_manager.run_level rl" +
                     " WHERE rc.rtag_id = " + rtag_id +
                     " AND   rl.rcon_id = rc.rcon_id" +
                     " AND   rc.bmcon_id is not NULL");
             stmt.setFetchSize(20);
-            ResultSet rset = stmt.executeQuery();
+            RmResultSet rset = new RmResultSet(stmt.executeQuery(),"queryRunLevel 2");
             int rcon_id = 0;
             int current_run_level = 0;
             String modeString;
             char mode;
             int pause = 0;
             int buildFilePresent = 0;
             while( rset.next() )
+            {
-                rcon_id = rset.getInt("rcon_id");
+                rcon_id = rset.mustGetKeyInt("rcon_id");
-                if ( rset.wasNull() )
-                {
-                    mLogger.fatal("queryRunLevel 2 null rcon_id");
-                    // show stopper
-                    throw new Exception("queryRunLevel 2 null rcon_id");
-                }
-                modeString = rset.getString("daemon_mode");
+                modeString = rset.mustGetString("daemon_mode");
-                if ( rset.wasNull() )
-                {
-                    mLogger.fatal("queryRunLevel 2 null rcon_id");
-                    // show stopper
-                    throw new Exception("queryRunLevel 2 null rcon_id");
-                }
                 mode = modeString.charAt(0);
-                buildFilePresent = rset.getInt("bfPresent");
+                buildFilePresent = rset.getInt("bfPresent",0);
-                current_run_level = rset.getInt("current_run_level");
+                current_run_level = rset.getInt("current_run_level", BuildState.DB_IDLE.toValue());
-                if ( rset.wasNull() )
-                {
-                    // slave may never have started to insert run level
-                    // use idle
-                    current_run_level = BuildState.DB_IDLE.toValue();
-                }
                 //
                 //  Pause: null -> 0 == Run
                 //         1         == Pause
                 //         2         == Disabled
                 //
-                pause = rset.getInt("pause");
+                pause = rset.getInt("pause", 0);
                 //  Ignore disabled entries
                 if ( pause <= 1 )
+                {
                     RunLevelData runLevel = new RunLevelData(rcon_id, current_run_level, mode, buildFilePresent);
                     "   AND rc.rcon_id=" + rcon_id +
                     "   AND rc.bmcon_id is not NULL" +
                     "   AND rc.daemon_mode='" + daemon_mode + "'" +
                     "   AND UPPER(rc.daemon_hostname)=UPPER('" + hostname + "')"
                     );
-            ResultSet rset = stmt.executeQuery();
+            RmResultSet rset = new RmResultSet(stmt.executeQuery(),"querySingleRunLevel");
             int rsetSize = 0;
             int current_run_level = 0;
             int pause = 0;
             int buildFilePresent = 0;
             while( rset.next() )
+            {
                 rsetSize++;
-                current_run_level = rset.getInt("current_run_level");
+                current_run_level = rset.mustGetInt("current_run_level");
-                if ( rset.wasNull() )
-                {
-                    mLogger.fatal("querySingleRunLevel null current_run_level");
-                    // show stopper
-                    throw new Exception("querySingleRunLevel null current_run_level");
-                }
-                buildFilePresent = rset.getInt("bfPresent");
+                buildFilePresent = rset.getInt("bfPresent",0);
                 //
                 //  Pause: null -> 0 == Run
                 //         1         == Pause
                 //         2         == Disabled
                 //
-                pause = rset.getInt("pause");
+                pause = rset.getInt("pause",0);
                 //  Ignore disabled daemons
                 if ( pause <= 1)
+                {
                     RunLevelData runLevel = new RunLevelData(rcon_id, current_run_level, daemon_mode, buildFilePresent);

Subversion Repositories DevTools

(root)/buildtool/trunk/src/main/java/com/erggroup/buildtool/ripple/ReleaseManager.java – Rev 6914 → 7023