Merge pull request arokem#2 from shabbychef/master

arokem · arokem · commit aa22364f0239 · 2012-12-20T18:48:29.000-08:00
fixes related to R2007b
diff --git a/pymatbridge/matlab/functions/JavaTcpServer.m b/pymatbridge/matlab/functions/JavaTcpServer.m
@@ -53,10 +53,15 @@
     case 'write'
         if(~isa(data,'int8')), error('TCP:input','Data must be of type int8'); end
         try
-            DataOutputStream(TCP.outputStream).write(data,0,length(data));
+			% in older versions of matlab, this gives an error about
+			% static constructors;
+            %DataOutputStream(TCP.outputStream).write(data,0,length(data));
+			dostr = DataOutputStream(TCP.outputStream);
+			dostr.write(data,0,length(data));
         catch
         end
 		try
+			% this might also barf if you change it to flush(), I believe.
 			DataOutputStream(TCP.outputStream).flush;
 		catch
 		end
diff --git a/pymatbridge/matlab/functions/text2header.m b/pymatbridge/matlab/functions/text2header.m
@@ -9,10 +9,18 @@
     switch(lower(type))
         case 'get'
             header.Get.Filename=request_words{i}{2};
-            header.Get.Protocol=request_words{i}{3};
+            if (numel(request_words{i}) > 2)
+                header.Get.Protocol=request_words{i}{3};
+            else
+                header.Get.Protocol = 'none_given'
+            end
         case 'post'
             header.Post.Filename=request_words{i}{2};
-            header.Post.Protocol=request_words{i}{3};
+            if (numel(request_words{i}) > 2)
+                header.Post.Protocol=request_words{i}{3};
+            else
+                header.Post.Protocol = 'none_given'
+            end
         case 'host:'
             header.Host=rmvp(line(7:end));
         case 'user-agent:'
@@ -82,4 +90,4 @@
         otherwise
             disp('unknown')
     end
-end
+end
