Changeset: 448e9014733f for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=448e9014733f Modified Files: java/ChangeLog.Oct2010 java/src/nl/cwi/monetdb/mcl/parser/StartOfHeaderParser.java sql/src/backends/monet5/sql.mx Branch: Oct2010 Log Message:
Java 1.6's subSequence() bug has changed into a slice() bug since 1.6.0_22. Revert workaround for subSequence breakage, since it breaks operating with the latest Java 1.6. diffs (38 lines): diff -r 0c0aca45ad39 -r 448e9014733f java/ChangeLog.Oct2010 --- a/java/ChangeLog.Oct2010 Mon Nov 08 11:12:17 2010 +0100 +++ b/java/ChangeLog.Oct2010 Mon Nov 08 11:41:05 2010 +0100 @@ -1,3 +1,8 @@ # ChangeLog file for java # This file is updated with mchangelog (Gentoo echangelog bastard script) +* Mon Nov 8 2010 Fabian Groffen <[email protected]> +- Java 1.6's subSequence() bug has changed into a slice() bug since + 1.6.0_22. Revert workaround for subSequence breakage, since it breaks + operating with the latest Java 1.6. + diff -r 0c0aca45ad39 -r 448e9014733f java/src/nl/cwi/monetdb/mcl/parser/StartOfHeaderParser.java --- a/java/src/nl/cwi/monetdb/mcl/parser/StartOfHeaderParser.java Mon Nov 08 11:12:17 2010 +0100 +++ b/java/src/nl/cwi/monetdb/mcl/parser/StartOfHeaderParser.java Mon Nov 08 11:41:05 2010 +0100 @@ -144,9 +144,6 @@ soh.reset(); - /* FIXME: slice() is only here to provide a workaround for a Sun-1.6 bug - see: http://bugs.sun.com/view_bug.do?bug_id=6795561 - As soon as this bug is fixed, the slice should be removed again. */ - return(soh.slice().subSequence(0, cnt).toString()); + return(soh.subSequence(0, cnt).toString()); } } diff -r 0c0aca45ad39 -r 448e9014733f sql/src/backends/monet5/sql.mx --- a/sql/src/backends/monet5/sql.mx Mon Nov 08 11:12:17 2010 +0100 +++ b/sql/src/backends/monet5/sql.mx Mon Nov 08 11:41:05 2010 +0100 @@ -1817,7 +1817,7 @@ } else if (!t) { return sql_message("DROP VIEW: unknown view '%s'", tname); } else if (!isView(t)) { - return sql_message("DROP VIEW: unable to drop view '%s'", tname); + return sql_message("DROP VIEW: unable to drop view '%s': is a table", tname); } else if (t->system) { return sql_message("DROP VIEW: cannot drop system view '%s'", tname); } else if (! drop_action && mvc_check_dependency(sql, t->base.id, VIEW_DEPENDENCY, NULL)) { _______________________________________________ Checkin-list mailing list [email protected] http://mail.monetdb.org/mailman/listinfo/checkin-list
