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
Sho SHIMIZU
2016-05-06 14:47:47 -0700
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
d66148a2405771c5d0e0edb6e60439da5370938d
d66148a2
1 parent
001e3f2a
Inline method
Change-Id: I51d8b9b22d0c61625144dcdb7d75d3565e60e197
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 additions
and
13 deletions
core/store/dist/src/main/java/org/onosproject/store/resource/impl/ConsistentResourceStore.java
core/store/dist/src/main/java/org/onosproject/store/resource/impl/ConsistentResourceStore.java
View file @
d66148a
...
...
@@ -124,7 +124,7 @@ public class ConsistentResourceStore extends AbstractStore<ResourceEvent, Resour
TransactionalContinuousResourceStore
continuousTxStore
=
continuousStore
.
transactional
(
tx
);
for
(
Map
.
Entry
<
DiscreteResource
,
List
<
Resource
>>
entry
:
resourceMap
.
entrySet
())
{
DiscreteResourceId
parentId
=
entry
.
getKey
().
id
();
if
(!
lookup
(
discreteTxStore
,
parentId
).
isPresent
())
{
if
(!
discreteTxStore
.
lookup
(
parentId
).
isPresent
())
{
return
abortTransaction
(
tx
);
}
...
...
@@ -407,18 +407,6 @@ public class ConsistentResourceStore extends AbstractStore<ResourceEvent, Resour
&&
continuousTxStore
.
removeValues
(
key
,
continuousValues
);
}
/**
* Returns the resource which has the same key as the specified resource ID
* in the set as a value of the map.
*
* @param id ID of resource to be checked
* @return the resource which is regarded as the same as the specified resource
*/
private
Optional
<
Resource
>
lookup
(
TransactionalDiscreteResourceStore
discreteTxStore
,
DiscreteResourceId
id
)
{
return
discreteTxStore
.
lookup
(
id
);
}
// internal use only
static
final
class
ContinuousResourceAllocation
{
private
final
ContinuousResource
original
;
...
...
Please
register
or
login
to post a comment