Permalink
Browse files

fixed get.

  • Loading branch information...
1 parent e02f9de commit c55fed97e74ea84adf0d6407805c2230d61419f2 Neil committed Aug 4, 2009
@@ -42,7 +42,7 @@
public class WalrusDataMessenger {
private static Logger LOG = Logger.getLogger( WalrusDataMessenger.class );
- private static final int DATA_QUEUE_SIZE = 2;
+ private static final int DATA_QUEUE_SIZE = 3;
private ConcurrentHashMap<String, ConcurrentHashMap<String,LinkedBlockingQueue<WalrusDataMessage>>> queueMap;
private ConcurrentHashMap<String, WalrusMonitor> monitorMap;
@@ -57,7 +57,6 @@ def typedCollection = {
binding("http://msgs.eucalyptus.ucsb.edu");
classList.each({
Class itsClass = Class.forName(it);
-
if ( itsClass.getSuperclass().getSimpleName().equals("Object") )
baseMapping(itsClass.getSimpleName(), itsClass.getName());
else if ( itsClass.getSuperclass().getSimpleName().equals("EucalyptusData") )
@@ -68,7 +67,8 @@ classList.each({
def fieldList = itsClass.getDeclaredFields().findAll({Modifier.isPrivate(it.getModifiers())})
fieldList.each({
Class itsType = it.getType();
- if ( itsType.getSuperclass().equals(edu.ucsb.eucalyptus.msgs.EucalyptusData) ) {
+ if (itsType.getSimpleName().endsWith("Channel")) {}
+ else if ( itsType.getSuperclass().equals(edu.ucsb.eucalyptus.msgs.EucalyptusData) ) {
typeBind(it.getName(), itsType.getName());
} else if ( it.getType().equals(java.util.ArrayList.class) ) {
if ( it.getGenericType() != null ) {
@@ -1,5 +1,6 @@
package edu.ucsb.eucalyptus.msgs
-import org.jboss.netty.handler.codec.http.HttpResponseStatus/*
+import org.jboss.netty.handler.codec.http.HttpResponseStatusimport org.jboss.netty.channel.Channel;
+/*
* Software License Agreement (BSD License)
*
* Copyright (c) 2008, Regents of the University of California
@@ -294,6 +295,10 @@ public class WalrusDataResponseType extends WalrusResponseType {
String contentDisposition;
}
+public class WalrusDataGetResponseType extends WalrusDataResponseType {
+
+}
+
public class PutObjectResponseType extends WalrusDataResponseType {
}
@@ -437,6 +442,7 @@ public class GetObjectType extends WalrusDataRequestType {
Boolean inlineData;
Boolean deleteAfterGet;
Boolean getTorrent;
+ Channel channel;
def GetObjectType() {
}
@@ -447,9 +453,13 @@ public class GetObjectType extends WalrusDataRequestType {
this.getMetaData = getMetaData;
this.inlineData = inlineData;
}
+
+ public Channel getChannel() {
+ return channel;
+ }
}
-public class GetObjectResponseType extends WalrusDataResponseType {
+public class GetObjectResponseType extends WalrusDataGetResponseType {
Status status;
String base64Data;
}
@@ -503,7 +513,7 @@ public class UpdateWalrusConfigurationResponseType extends WalrusResponseType {
public class GetDecryptedImageType extends WalrusDataRequestType {
}
-public class GetDecryptedImageResponseType extends WalrusDataResponseType {
+public class GetDecryptedImageResponseType extends WalrusDataGetResponseType {
}
public class CheckImageType extends WalrusDataRequestType {
Oops, something went wrong.

0 comments on commit c55fed9

Please sign in to comment.