You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by iv...@apache.org on 2015/07/21 13:25:15 UTC
[21/29] incubator-ignite git commit: #ignite-961-master: small fixes
#ignite-961-master: small fixes
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ec76ec75
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ec76ec75
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ec76ec75
Branch: refs/heads/ignite-961
Commit: ec76ec75884e066346495e17952feebbd1ddd190
Parents: dd9999d
Author: ivasilinets <iv...@gridgain.com>
Authored: Mon Jul 20 22:45:51 2015 +0300
Committer: ivasilinets <iv...@gridgain.com>
Committed: Mon Jul 20 22:45:51 2015 +0300
----------------------------------------------------------------------
.../org/apache/ignite/internal/IgniteKernal.java | 4 +---
.../handlers/cache/GridCacheCommandHandler.java | 17 ++++++++++++-----
2 files changed, 13 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ec76ec75/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 7fd75ce..8a16e48 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
@@ -439,8 +439,7 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable {
assert cfg != null;
return F.transform(cfg.getUserAttributes().entrySet(), new C1<Map.Entry<String, ?>, String>() {
- @Override
- public String apply(Map.Entry<String, ?> e) {
+ @Override public String apply(Map.Entry<String, ?> e) {
return e.getKey() + ", " + e.getValue().toString();
}
});
@@ -2466,7 +2465,6 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable {
}
}
-
/** {@inheritDoc} */
@Override public <K, V> IgniteCache<K, V> getOrCreateCache(String cacheName) {
guard();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ec76ec75/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandler.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandler.java
index 883a2bf..2d75341 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandler.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandler.java
@@ -172,11 +172,11 @@ public class GridCacheCommandHandler extends GridRestCommandHandlerAdapter {
case GET_OR_CREATE_CACHE: {
fut = new GetOrCreateCacheClosure(cacheName).apply(ctx).chain(
new CX1<IgniteInternalFuture<?>, GridRestResponse>() {
- @Override public GridRestResponse applyx(IgniteInternalFuture<?> f)
- throws IgniteCheckedException {
- return new GridRestResponse(f.get());
- }
- });
+ @Override public GridRestResponse applyx(IgniteInternalFuture<?> f)
+ throws IgniteCheckedException {
+ return new GridRestResponse(f.get());
+ }
+ });
break;
}
@@ -1353,7 +1353,12 @@ public class GridCacheCommandHandler extends GridRestCommandHandlerAdapter {
* Destroy cache callable.
*/
private static class DestroyCacheCommand extends GetOrCreateCacheClosure {
+ /** */
+ private static final long serialVersionUID = 0L;
+ /**
+ * @param cacheName Cache name.
+ */
public DestroyCacheCommand(String cacheName) {
super(cacheName);
}
@@ -1369,6 +1374,8 @@ public class GridCacheCommandHandler extends GridRestCommandHandlerAdapter {
*/
private static class GetOrCreateCacheClosure implements
IgniteClosure<GridKernalContext, IgniteInternalFuture<?>> {
+ /** */
+ private static final long serialVersionUID = 0L;
/** Cache name. */
protected String cacheName;