Title: [714] trunk/rails-integration/src/main: The string_to_byte hack is no longer required.
- Revision
- 714
- Author
- tantalon
- Date
- 2007-08-25 00:08:23 -0400 (Sat, 25 Aug 2007)
Log Message
The string_to_byte hack is no longer required.
Modified Paths
Removed Paths
Diff
Deleted: trunk/rails-integration/src/main/java/org/jruby/webapp/util/StringHandler.java (713 => 714)
--- trunk/rails-integration/src/main/java/org/jruby/webapp/util/StringHandler.java 2007-08-25 03:47:44 UTC (rev 713)
+++ trunk/rails-integration/src/main/java/org/jruby/webapp/util/StringHandler.java 2007-08-25 04:08:23 UTC (rev 714)
@@ -1,45 +0,0 @@
-/***** BEGIN LICENSE BLOCK *****
- * Version: CPL 1.0/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Common Public
- * License Version 1.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.eclipse.org/legal/cpl-v10.html
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * Copyright (C) 2007 Ola Bini <[EMAIL PROTECTED]>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the CPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the CPL, the GPL or the LGPL.
- ***** END LICENSE BLOCK *****/
-package org.jruby.webapp.util;
-
-import org.jruby.runtime.builtin.IRubyObject;
-import org.jruby.RubyString;
-import org.jruby.util.ByteList;
-
-/**
- * @author <a href="" PROTECTED]">Ola Bini</a>
- */
-public class StringHandler {
- public static byte[] stringToBytes(IRubyObject str) {
- return ((RubyString)str.getInstanceVariable("@string")).getBytes();
- }
-
- public static RubyString bytesToString(IRubyObject self, byte[] bs) {
- return RubyString.newString(self.getRuntime(),new ByteList(bs, false));
- }
-}// StringHandler
Modified: trunk/rails-integration/src/main/ruby/builtin/rails-integration/session/java_servlet_store.rb (713 => 714)
--- trunk/rails-integration/src/main/ruby/builtin/rails-integration/session/java_servlet_store.rb 2007-08-25 03:47:44 UTC (rev 713)
+++ trunk/rails-integration/src/main/ruby/builtin/rails-integration/session/java_servlet_store.rb 2007-08-25 04:08:23 UTC (rev 714)
@@ -20,7 +20,7 @@
if java_session
marshalled_bytes = java_session.getAttribute('__current_rails_session');
if marshalled_bytes
- marshalled_string = bytes_to_string(marshalled_bytes)
+ marshalled_string = String.from_java_bytes(marshalled_bytes)
@session_data = Marshal.load(marshalled_string)
end
end
@@ -31,7 +31,7 @@
def update
java_session = @java_request.getSession(true)
marshalled_string = Marshal.dump(@session_data)
- marshalled_bytes = string_to_bytes(marshalled_string)
+ marshalled_bytes = marshalled_string.to_java_bytes
java_session.setAttribute('__current_rails_session', marshalled_bytes)
end
@@ -51,18 +51,6 @@
@session_data
end
- private
-
- def string_to_bytes(str)
- o = Object.new
- o.instance_variable_set :@string, str
- org.jruby.webapp.util.StringHandler.stringToBytes(o)
- end
-
- def bytes_to_string(bytes)
- org.jruby.webapp.util.StringHandler.bytesToString(self, bytes)
- end
-
end
end
end
_______________________________________________
Jruby-extras-devel mailing list
[email protected]
http://rubyforge.org/mailman/listinfo/jruby-extras-devel
