Toggle navigation
Toggle navigation
This project
Loading...
Sign in
홍길동
/
onos
Go to a project
Toggle navigation
Toggle navigation pinning
Projects
Groups
Snippets
Help
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Snippets
Network
Create a new issue
Builds
Commits
Issue Boards
Authored by
Yuta HIGUCHI
2014-11-06 19:04:13 -0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
c6b8f611e6e8dd365972bd5a5112c968d07dd5df
c6b8f611
1 parent
361664ee
checkstyle
Change-Id: Ie794af1b06777c4c4332c4047ad88ecbe1b2f550
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
4 deletions
apps/foo/src/main/java/org/onlab/onos/foo/FooComponent.java
core/store/dist/src/main/java/org/onlab/onos/store/service/impl/DatabaseManager.java
core/store/dist/src/main/java/org/onlab/onos/store/service/impl/DatabaseStateMachine.java
apps/foo/src/main/java/org/onlab/onos/foo/FooComponent.java
View file @
c6b8f61
...
...
@@ -201,7 +201,7 @@ public class FooComponent {
}
else
{
log
.
info
(
"Write failed trying to write{}"
,
next
);
}
}
while
(
retry
--
>
0
);
}
while
(
retry
--
>
0
);
}
catch
(
Exception
e
)
{
log
.
error
(
"Exception thrown"
,
e
);
}
...
...
core/store/dist/src/main/java/org/onlab/onos/store/service/impl/DatabaseManager.java
View file @
c6b8f61
...
...
@@ -34,7 +34,6 @@ import org.onlab.onos.store.service.DatabaseService;
import
org.onlab.onos.store.service.NoSuchTableException
;
import
org.onlab.onos.store.service.OptimisticLockException
;
import
org.onlab.onos.store.service.OptionalResult
;
import
org.onlab.onos.store.service.PreconditionFailedException
;
import
org.onlab.onos.store.service.ReadRequest
;
import
org.onlab.onos.store.service.ReadResult
;
import
org.onlab.onos.store.service.WriteAborted
;
...
...
@@ -195,8 +194,8 @@ public class DatabaseManager implements DatabaseService, DatabaseAdminService {
}
@Override
public
WriteResult
write
(
WriteRequest
request
)
throws
OptimisticLockException
,
PreconditionFailedException
{
public
WriteResult
write
(
WriteRequest
request
)
{
//
throws OptimisticLockException, PreconditionFailedException {
return
writeNothrow
(
request
).
get
();
}
...
...
core/store/dist/src/main/java/org/onlab/onos/store/service/impl/DatabaseStateMachine.java
View file @
c6b8f61
...
...
@@ -117,6 +117,8 @@ public class DatabaseStateMachine implements StateMachine {
return
InternalWriteResult
.
Status
.
PREVIOUS_VERSION_MISMATCH
;
case
REMOVE:
return
InternalWriteResult
.
Status
.
OK
;
default
:
break
;
}
log
.
error
(
"Should never reach here {}"
,
request
);
return
InternalWriteResult
.
Status
.
ABORTED
;
...
...
Please
register
or
login
to post a comment