Commit ea9b5e72 authored by dev_sky's avatar dev_sky
Browse files

Merge remote-tracking branch 'upstream/dev' into dev

parents 7e268bfd 1f8851b9

dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/CommonUtils.java

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ public class CommonUtils { 
        envPath = envDefaultPath.getPath();

        logger.debug("env path :{}", envPath);

      }else{

        envPath = System.getProperty("user.home") + File.separator + ".bash_profile";

        envPath =  "/etc/profile";

      }

    }

dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/sql/SqlTask.java

+2 −2
Original line number Diff line number Diff line
@@ -364,7 +364,7 @@ public class SqlTask extends AbstractTask { 
                       Connection connection){

        if (resultSet != null){

            try {

                connection.close();

                resultSet.close();

            } catch (SQLException e) {



            }
@@ -372,7 +372,7 @@ public class SqlTask extends AbstractTask { 


        if (pstmt != null){

            try {

                connection.close();

                pstmt.close();

            } catch (SQLException e) {



            }