홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Yuta HIGUCHI
657626eb 1 parent 7fe161a1

bugfix @Activate -> @Deactivate 

Change-Id: I38b4c86e20275f36e201cfa41a311c86b1dfe95f
Inline Side-by-side
Showing 4 changed files with 6 additions and 1 deletions
1 package org.onlab.onos.store.service; 1 package org.onlab.onos.store.service;
2 2
3 +
3 /** 4 /**
4 * Exception thrown when an operation (read or write) is requested for 5 * Exception thrown when an operation (read or write) is requested for
5 * a table that does not exist. 6 * a table that does not exist.
......
1 package org.onlab.onos.store.service; 1 package org.onlab.onos.store.service;
2 2
3 +
3 /** 4 /**
4 * Exception that indicates a precondition failure. 5 * Exception that indicates a precondition failure.
5 * Scenarios that can cause this exception: 6 * Scenarios that can cause this exception:
......
1 package org.onlab.onos.store.service; 1 package org.onlab.onos.store.service;
2 2
3 +
3 /** 4 /**
4 * Exception that indicates a write operation is aborted. 5 * Exception that indicates a write operation is aborted.
5 * Aborted operations do not mutate database state is any form. 6 * Aborted operations do not mutate database state is any form.
......
...@@ -15,6 +15,7 @@ import net.kuujo.copycat.log.ChronicleLog; ...@@ -15,6 +15,7 @@ import net.kuujo.copycat.log.ChronicleLog;
15 import net.kuujo.copycat.log.Log; 15 import net.kuujo.copycat.log.Log;
16 16
17 import org.apache.felix.scr.annotations.Activate; 17 import org.apache.felix.scr.annotations.Activate;
18 +import org.apache.felix.scr.annotations.Deactivate;
18 import org.apache.felix.scr.annotations.Reference; 19 import org.apache.felix.scr.annotations.Reference;
19 import org.apache.felix.scr.annotations.ReferenceCardinality; 20 import org.apache.felix.scr.annotations.ReferenceCardinality;
20 import org.onlab.netty.Endpoint; 21 import org.onlab.netty.Endpoint;
...@@ -91,9 +92,10 @@ public class DatabaseManager implements DatabaseService, DatabaseAdminService { ...@@ -91,9 +92,10 @@ public class DatabaseManager implements DatabaseService, DatabaseAdminService {
91 log.info("Started."); 92 log.info("Started.");
92 } 93 }
93 94
94 - @Activate 95 + @Deactivate
95 public void deactivate() { 96 public void deactivate() {
96 copycat.stop(); 97 copycat.stop();
98 + log.info("Stopped.");
97 } 99 }
98 100
99 @Override 101 @Override
......