Merge remote-tracking branch 'upstream/master' into druid-admin

.gitignore

@@ -15,3 +15,5 @@ out/
 *.iws
 *.iml
 /bin
+hs_err_pid*.log
+replay_pid*.log

pom.xml

@@ -201,9 +201,9 @@
 
 	<profiles>
 		<profile>
-			<id>default-profile</id>
+			<id>jconsole</id>
 			<activation>
-				<activeByDefault>true</activeByDefault>
+				<!--<activeByDefault>true</activeByDefault>-->
 				<file>
 					<exists>${env.JAVA_HOME}/lib/jconsole.jar</exists>
 				</file>
@@ -232,6 +232,19 @@
 				</dependency>
 			</dependencies>
 		</profile>
+		<profile>
+			<id>java11plus</id>
+			<activation>
+				<jdk>[11,)</jdk>
+			</activation>
+			<dependencies>
+				<dependency>
+					<groupId>javax.annotation</groupId>
+					<artifactId>javax.annotation-api</artifactId>
+					<version>1.3.2</version>
+				</dependency>
+			</dependencies>
+		</profile>
 		<profile>
 			<id>mac-profile</id>
 			<activation>

src/main/java/com/alibaba/druid/sql/dialect/postgresql/ast/stmt/PGSelectQueryBlock.java

@@ -109,6 +109,9 @@ public class PGSelectQueryBlock extends SQLSelectQueryBlock implements PGSQLObje
     }
 
     public void setOrderBy(SQLOrderBy orderBy) {
+        if (orderBy != null) {
+            orderBy.setParent(this);
+        }
         this.orderBy = orderBy;
     }
 

src/main/resources/support/http/resources/sql.html

@@ -143,6 +143,9 @@
 	    				var html = "";
 	    				for ( var i = 0; i < sqlStatList.length; i++) {
 	    					var stat = sqlStatList[i], statSQL=stat.SQL;
+						if (statSQL == null || statSQL == undefined) {
+						    continue;
+						}
 	    					var newStatSQL=statSQL.replace(/\"/g,"'").replace(/</g,"&lt;").replace(/>/g,"&gt;");
 	    					var newRow = sqlStatTable.insertRow(-1);
 	    					html += "<tr>";