Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

quick fix for npe 

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@582910 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Robert Davies 2007-10-08 17:47:47 +00:00
parent 22fbb80daf
commit b9d0972596
1 changed files with 29 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
activemq-core/src/main/java/org/apache/activemq/kaha/impl/index/VMIndexLinkedList.java
View File

@ -36,7 +36,7 @@ public final class VMIndexLinkedList implements Cloneable, IndexLinkedList {
root.prev = root;
}
public IndexItem getRoot() {
public synchronized IndexItem getRoot() {
return root;
}
@ -45,7 +45,7 @@ public final class VMIndexLinkedList implements Cloneable, IndexLinkedList {
*
* @see org.apache.activemq.kaha.impl.IndexLinkedList#getFirst()
*/
public IndexItem getFirst() {
public synchronized IndexItem getFirst() {
if (size == 0) {
return null;
}
@ -57,7 +57,7 @@ public final class VMIndexLinkedList implements Cloneable, IndexLinkedList {
*
* @see org.apache.activemq.kaha.impl.IndexLinkedList#getLast()
*/
public IndexItem getLast() {
public synchronized IndexItem getLast() {
if (size == 0) {
return null;
}
@ -69,7 +69,7 @@ public final class VMIndexLinkedList implements Cloneable, IndexLinkedList {
*
* @see org.apache.activemq.kaha.impl.IndexLinkedList#removeFirst()
*/
public StoreEntry removeFirst() {
public synchronized StoreEntry removeFirst() {
if (size == 0) {
return null;
}
@ -83,7 +83,7 @@ public final class VMIndexLinkedList implements Cloneable, IndexLinkedList {
*
* @see org.apache.activemq.kaha.impl.IndexLinkedList#removeLast()
*/
public Object removeLast() {
public synchronized Object removeLast() {
if (size == 0) {
return null;
}
@ -97,7 +97,7 @@ public final class VMIndexLinkedList implements Cloneable, IndexLinkedList {
*
* @see org.apache.activemq.kaha.impl.IndexLinkedList#addFirst(org.apache.activemq.kaha.impl.IndexItem)
*/
public void addFirst(IndexItem item) {
public synchronized void addFirst(IndexItem item) {
addBefore(item, root.next);
}
@ -106,7 +106,7 @@ public final class VMIndexLinkedList implements Cloneable, IndexLinkedList {
*
* @see org.apache.activemq.kaha.impl.IndexLinkedList#addLast(org.apache.activemq.kaha.impl.IndexItem)
*/
public void addLast(IndexItem item) {
public synchronized void addLast(IndexItem item) {
addBefore(item, root);
}
@ -115,7 +115,7 @@ public final class VMIndexLinkedList implements Cloneable, IndexLinkedList {
*
* @see org.apache.activemq.kaha.impl.IndexLinkedList#size()
*/
public int size() {
public synchronized int size() {
return size;
}
@ -124,7 +124,7 @@ public final class VMIndexLinkedList implements Cloneable, IndexLinkedList {
*
* @see org.apache.activemq.kaha.impl.IndexLinkedList#isEmpty()
*/
public boolean isEmpty() {
public synchronized boolean isEmpty() {
return size == 0;
}
@ -133,7 +133,7 @@ public final class VMIndexLinkedList implements Cloneable, IndexLinkedList {
*
* @see org.apache.activemq.kaha.impl.IndexLinkedList#add(org.apache.activemq.kaha.impl.IndexItem)
*/
public boolean add(IndexItem item) {
public synchronized boolean add(IndexItem item) {
addBefore(item, root);
return true;
}
@ -143,7 +143,7 @@ public final class VMIndexLinkedList implements Cloneable, IndexLinkedList {
*
* @see org.apache.activemq.kaha.impl.IndexLinkedList#clear()
*/
public void clear() {
public synchronized void clear() {
root.next = root;
root.prev = root;
size = 0;
@ -155,7 +155,7 @@ public final class VMIndexLinkedList implements Cloneable, IndexLinkedList {
*
* @see org.apache.activemq.kaha.impl.IndexLinkedList#get(int)
*/
public IndexItem get(int index) {
public synchronized IndexItem get(int index) {
return entry(index);
}
@ -165,7 +165,7 @@ public final class VMIndexLinkedList implements Cloneable, IndexLinkedList {
* @see org.apache.activemq.kaha.impl.IndexLinkedList#add(int,
* org.apache.activemq.kaha.impl.IndexItem)
*/
public void add(int index, IndexItem element) {
public synchronized void add(int index, IndexItem element) {
addBefore(element, index == size ? root : entry(index));
}
@ -174,7 +174,7 @@ public final class VMIndexLinkedList implements Cloneable, IndexLinkedList {
*
* @see org.apache.activemq.kaha.impl.IndexLinkedList#remove(int)
*/
public Object remove(int index) {
public synchronized Object remove(int index) {
IndexItem e = entry(index);
remove(e);
return e;
@ -206,7 +206,7 @@ public final class VMIndexLinkedList implements Cloneable, IndexLinkedList {
*
* @see org.apache.activemq.kaha.impl.IndexLinkedList#indexOf(org.apache.activemq.kaha.impl.IndexItem)
*/
public int indexOf(StoreEntry o) {
public synchronized int indexOf(StoreEntry o) {
int index = 0;
for (IndexItem e = root.next; e != root; e = e.next) {
if (o == e) {
@ -222,7 +222,7 @@ public final class VMIndexLinkedList implements Cloneable, IndexLinkedList {
*
* @see org.apache.activemq.kaha.impl.IndexLinkedList#getNextEntry(org.apache.activemq.kaha.impl.IndexItem)
*/
public IndexItem getNextEntry(IndexItem entry) {
public synchronized IndexItem getNextEntry(IndexItem entry) {
return entry.next != root ? entry.next : null;
}
@ -231,7 +231,7 @@ public final class VMIndexLinkedList implements Cloneable, IndexLinkedList {
*
* @see org.apache.activemq.kaha.impl.IndexLinkedList#getPrevEntry(org.apache.activemq.kaha.impl.IndexItem)
*/
public IndexItem getPrevEntry(IndexItem entry) {
public synchronized IndexItem getPrevEntry(IndexItem entry) {
return entry.prev != root ? entry.prev : null;
}
@ -241,7 +241,7 @@ public final class VMIndexLinkedList implements Cloneable, IndexLinkedList {
* @see org.apache.activemq.kaha.impl.IndexLinkedList#addBefore(org.apache.activemq.kaha.impl.IndexItem,
* org.apache.activemq.kaha.impl.IndexItem)
*/
public void addBefore(IndexItem insert, IndexItem e) {
public synchronized void addBefore(IndexItem insert, IndexItem e) {
insert.next = e;
insert.prev = e.prev;
insert.prev.next = insert;
@ -254,10 +254,16 @@ public final class VMIndexLinkedList implements Cloneable, IndexLinkedList {
*
* @see org.apache.activemq.kaha.impl.IndexLinkedList#remove(org.apache.activemq.kaha.impl.IndexItem)
*/
public void remove(IndexItem e) {
if (e == root) {
public synchronized void remove(IndexItem e) {
if (e == root || e.equals(root)) {
return;
}
if (e.prev==null){
e.prev=root;
}
if (e.next==null){
e.next=root;
}
e.prev.next = e.next;
e.next.prev = e.prev;
size--;
@ -266,7 +272,7 @@ public final class VMIndexLinkedList implements Cloneable, IndexLinkedList {
/**
* @return clone
*/
public Object clone() {
public synchronized Object clone() {
IndexLinkedList clone = new VMIndexLinkedList(this.root);
for (IndexItem e = root.next; e != root; e = e.next) {
clone.add(e);
@ -274,7 +280,7 @@ public final class VMIndexLinkedList implements Cloneable, IndexLinkedList {
return clone;
}
public StoreEntry getEntry(StoreEntry current) {
public synchronized StoreEntry getEntry(StoreEntry current) {
return current;
}
@ -283,7 +289,7 @@ public final class VMIndexLinkedList implements Cloneable, IndexLinkedList {
*
* @param current
*/
public StoreEntry refreshEntry(StoreEntry current) {
public synchronized StoreEntry refreshEntry(StoreEntry current) {
return current;
}
}