You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vo...@apache.org on 2016/06/07 07:56:15 UTC
[12/14] ignite git commit: Minors.
Minors.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/93f8eca5
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/93f8eca5
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/93f8eca5
Branch: refs/heads/ignite-3264
Commit: 93f8eca53008849ccfe609b5c7e5c20425f530e7
Parents: da1ff65
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Tue Jun 7 09:57:07 2016 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Tue Jun 7 09:57:07 2016 +0300
----------------------------------------------------------------------
.../main/java/org/apache/ignite/internal/IgniteKernal.java | 6 +++---
.../ignite/internal/processors/igfs/IgfsOutputStreamImpl.java | 7 ++++---
2 files changed, 7 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/93f8eca5/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 d257807..d1f3ef5 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
@@ -862,9 +862,9 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable {
startProcessor(new DataStreamProcessor(ctx));
startProcessor((GridProcessor)IGFS.create(ctx, F.isEmpty(cfg.getFileSystemConfiguration())));
startProcessor(new GridContinuousProcessor(ctx));
-// startProcessor((GridProcessor)(cfg.isPeerClassLoadingEnabled() ?
-// IgniteComponentType.HADOOP.create(ctx, true): // No-op when peer class loading is enabled.
-// IgniteComponentType.HADOOP.createIfInClassPath(ctx, cfg.getHadoopConfiguration() != null)));
+ startProcessor((GridProcessor)(cfg.isPeerClassLoadingEnabled() ?
+ IgniteComponentType.HADOOP.create(ctx, true): // No-op when peer class loading is enabled.
+ IgniteComponentType.HADOOP.createIfInClassPath(ctx, cfg.getHadoopConfiguration() != null)));
startProcessor(new DataStructuresProcessor(ctx));
startProcessor(createComponent(PlatformProcessor.class, ctx));
http://git-wip-us.apache.org/repos/asf/ignite/blob/93f8eca5/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsOutputStreamImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsOutputStreamImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsOutputStreamImpl.java
index 16a20a2..f51e9b5 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsOutputStreamImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsOutputStreamImpl.java
@@ -271,12 +271,12 @@ class IgfsOutputStreamImpl extends IgfsOutputStream {
*/
@Override public void flush() throws IOException {
synchronized (mux) {
-
boolean exists;
try {
exists = igfsCtx.meta().exists(fileInfo.id());
- } catch (IgniteCheckedException e) {
+ }
+ catch (IgniteCheckedException e) {
throw new IOException("File to read file metadata: " + path, e);
}
@@ -315,7 +315,8 @@ class IgfsOutputStreamImpl extends IgfsOutputStream {
space = 0;
}
- } catch (IgniteCheckedException e) {
+ }
+ catch (IgniteCheckedException e) {
throw new IOException("Failed to flush data [path=" + path + ", space=" + space + ']', e);
}
}