ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [13/37] incubator-ignite git commit: #ignite-311: small fix.
Date Sun, 01 Mar 2015 12:40:06 GMT
#ignite-311: small fix.


Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/5eeb8a2a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/5eeb8a2a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/5eeb8a2a

Branch: refs/heads/ignite-239
Commit: 5eeb8a2a578d77d648977dc58b7588da5e6df6fc
Parents: 63c3f54
Author: ivasilinets <ivasilinets@gridgain.com>
Authored: Fri Feb 20 15:15:40 2015 +0300
Committer: ivasilinets <ivasilinets@gridgain.com>
Committed: Fri Feb 20 15:15:40 2015 +0300

----------------------------------------------------------------------
 .../org/apache/ignite/configuration/IgniteConfiguration.java     | 2 +-
 .../src/main/java/org/apache/ignite/internal/IgniteKernal.java   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5eeb8a2a/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
b/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
index 72ab928..1dfee9c 100644
--- a/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
@@ -1875,7 +1875,7 @@ public class IgniteConfiguration {
      * @return Plugin configurations.
      */
     public Collection<? extends PluginConfiguration> getPluginConfigurations() {
-        return pluginCfgs;
+        return pluginCfgs == null ? Collections.<PluginConfiguration>emptyList() :
pluginCfgs;
     }
 
     /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5eeb8a2a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
index ceca4a7..2b6e832 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
@@ -1541,7 +1541,7 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable
{
                 info.add("/___/\\___/_/|_/___/ /_/ /___/  ");
                 info.add(" ");
                 info.add(COPYRIGHT);
-                info.addAll(Arrays.asList(pluginInfo().split(NL)));
+                info.addAll(Arrays.asList(pluginInfo().split(NL + ">>> ")));
                 info.add("");
                 info.add("Quiet mode.");
 
@@ -1579,7 +1579,7 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable
{
         String info = PLUGIN_INFO + NL;
 
         for (PluginConfiguration cfg : pluginsCfg)
-            info += cfg.name() + " " + cfg.version() + NL;
+            info += ">>> " + cfg.name() + " " + cfg.version() + NL;
 
         return info;
     }


Mime
View raw message