Merge branch 'hotfix-1.6.2'

orientechnologies · Dec 10, 2013 · bbb45db · bbb45db
2 parents f3eff9b + 57903bf
commit bbb45db
Show file tree

Hide file tree

Showing 171 changed files with 3,211 additions and 1,164 deletions.
diff --git a/_base/base-build.xml b/_base/base-build.xml
@@ -13,6 +13,9 @@
     <property name="project.debug-level" value="lines,vars,source"/>
     <property name="project.target-comp" value="1.6"/>
     <property name="project.source-comp" value="1.6"/>
+    <property name="ant.build.javac.source" value="1.6"/>
+    <property name="ant.build.javac.target" value="1.6"/>
+
     <property name="build.sysclasspath" value="ignore"/>
 
     <path id="project.classpath">

diff --git a/build.xml b/build.xml
@@ -5,7 +5,7 @@
     <property environment="env"/>
     <property name="vendor" value="NuvolaBase Ltd"/>
     <property name="product" value="OrientDB"/>
-    <property name="version" value="1.6.1"/>
+    <property name="version" value="1.6.2"/>
     <condition property="community.release" value="${releaseHome}/orientdb-community-${version}"
                else="../releases/orientdb-community-${version}">
         <isset property="releaseHome"/>

diff --git a/client/pom.xml b/client/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>com.orientechnologies</groupId>
         <artifactId>orientdb-parent</artifactId>
-        <version>1.6.1</version>
+        <version>1.6.2</version>
         <relativePath>../</relativePath>
     </parent>
 
@@ -35,7 +35,6 @@
     <properties>
         <osgi.import>*</osgi.import>
         <osgi.export>com.orientechnologies.orient.client.*</osgi.export>
-        <osgi.fragment.host>com.orientechnologies.orientdb-core</osgi.fragment.host>
     </properties>
 
     <dependencies>
@@ -46,5 +45,4 @@
         </dependency>
     </dependencies>
 
-
 </project>
diff --git a/client/src/main/java/com/orientechnologies/orient/client/remote/OStorageRemote.java b/client/src/main/java/com/orientechnologies/orient/client/remote/OStorageRemote.java
@@ -1809,13 +1809,15 @@ private void removeDeadConnections() {
     // FREE DEAD CONNECTIONS
     int removedDeadConnections = 0;
     for (OChannelBinaryAsynchClient n : new ArrayList<OChannelBinaryAsynchClient>(networkPool)) {
-      if (n != null && !n.isConnected())
+      if (n != null && !n.isConnected()) //Fixed issue with removing of network connections though connection is active.
+      {
         try {
           n.close();
         } catch (Exception e) {
         }
       networkPool.remove(n);
       removedDeadConnections++;
+      }
     }
 
     OLogManager.instance().debug(this, "Found and removed %d dead connections from the network pool", removedDeadConnections);

diff --git a/commons/pom.xml b/commons/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>com.orientechnologies</groupId>
         <artifactId>orientdb-parent</artifactId>
-        <version>1.6.1</version>
+        <version>1.6.2</version>
         <relativePath>../</relativePath>
     </parent>
 
@@ -35,7 +35,6 @@
     <properties>
         <osgi.export>com.orientechnologies.common.*</osgi.export>
         <osgi.import>javax.imageio.spi.*,sun.misc.*;resolution:=optional</osgi.import>
-        <osgi.fragment.host>com.orientechnologies.orientdb-core</osgi.fragment.host>
     </properties>
 
     <dependencies>

diff --git a/commons/src/main/java/com/orientechnologies/common/comparator/OCaseInsentiveComparator.java b/commons/src/main/java/com/orientechnologies/common/comparator/OCaseInsentiveComparator.java
@@ -7,6 +7,6 @@
  */
 public class OCaseInsentiveComparator implements Comparator<String> {
   public int compare(final String stringOne, final String stringTwo) {
-    return stringOne.toLowerCase().compareTo(stringTwo.toLowerCase());
+    return stringOne.compareToIgnoreCase(stringTwo);
   }
 }
diff --git a/commons/src/main/java/com/orientechnologies/common/console/OCommandStream.java b/commons/src/main/java/com/orientechnologies/common/console/OCommandStream.java
@@ -0,0 +1,11 @@
+package com.orientechnologies.common.console;
+
+import com.orientechnologies.common.concur.resource.OCloseable;
+
+/**
+ * @author <a href='mailto:enisher@gmail.com'> Artem Orobets </a>
+ */
+public interface OCommandStream extends OCloseable {
+  boolean hasNext();
+  String nextCommand();
+}
diff --git a/commons/src/main/java/com/orientechnologies/common/console/OConsoleApplication.java b/commons/src/main/java/com/orientechnologies/common/console/OConsoleApplication.java
@@ -22,8 +22,14 @@
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
 import java.util.Map.Entry;
+import java.util.TreeMap;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -85,7 +91,7 @@ public int run() {
         if (consoleInput == null || consoleInput.length() == 0)
           continue;
 
-        if (!executeCommands(new Scanner(consoleInput), false))
+        if (!executeCommands(new ODFACommandStream(consoleInput), false))
           break;
       }
     } else {
@@ -105,28 +111,22 @@ protected boolean isInteractiveMode(String[] args) {
   protected boolean executeBatch(final String commandLine) {
     final File commandFile = new File(commandLine);
 
-    Scanner scanner = null;
-
+    OCommandStream scanner;
     try {
-      scanner = new Scanner(commandFile);
+      scanner = new ODFACommandStream(commandFile);
     } catch (FileNotFoundException e) {
-      scanner = new Scanner(commandLine);
+      scanner = new ODFACommandStream(commandLine);
     }
 
     return executeCommands(scanner, true);
   }
 
-  protected boolean executeCommands(final Scanner iScanner, final boolean iExitOnException) {
+  protected boolean executeCommands(final OCommandStream commandStream, final boolean iExitOnException) {
     final StringBuilder commandBuffer = new StringBuilder();
 
     try {
-      String commandLine = null;
-
-      iScanner.useDelimiter(";(?=([^\"]*\"[^\"]*\")*[^\"]*$)(?=([^']*'[^']*')*[^']*$)|\n");
-
-      while (iScanner.hasNext()) {
-
-        commandLine = iScanner.next().trim();
+      while (commandStream.hasNext()) {
+        String commandLine = commandStream.nextCommand();
 
         if (commandLine.isEmpty())
           // EMPTY LINE
@@ -167,7 +167,7 @@ protected boolean executeCommands(final Scanner iScanner, final boolean iExitOnE
           return false;
       }
     } finally {
-      iScanner.close();
+      commandStream.close();
     }
     return true;
   }
@@ -349,7 +349,7 @@ protected void syntaxError(String iCommand, Method m) {
   /**
    * Returns a map of all console method and the object they can be called on.
    * 
-   * @return Map<Method,Object>
+   * @return Map&lt;Method,Object&gt;
    */
   protected Map<Method, Object> getConsoleMethods() {