You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-commits@db.apache.org by kr...@apache.org on 2008/05/21 11:55:34 UTC
svn commit: r658612 - in /db/derby/code/trunk/java/engine/org/apache/derby:
iapi/services/property/PropertyUtil.java
iapi/sql/dictionary/DataDictionary.java iapi/util/StringUtil.java
impl/sql/catalog/DataDictionaryImpl.java
Author: kristwaa
Date: Wed May 21 02:55:34 2008
New Revision: 658612
URL: http://svn.apache.org/viewvc?rev=658612&view=rev
Log:
DERBY-3673: Add checks that a new role isn't already a user authorization id.
Fixed JavaDoc warnings.
Patch file: derby-3673-3a-javadoc_fixes.diff
Modified:
db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/property/PropertyUtil.java
db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/DataDictionary.java
db/derby/code/trunk/java/engine/org/apache/derby/iapi/util/StringUtil.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DataDictionaryImpl.java
Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/property/PropertyUtil.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/property/PropertyUtil.java?rev=658612&r1=658611&r2=658612&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/property/PropertyUtil.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/property/PropertyUtil.java Wed May 21 02:55:34 2008
@@ -530,11 +530,11 @@
* comparison is performed against username, which is presumed
* normalized already.
*
- * @param object which implements PersistentSet interface
+ * @param set object which implements PersistentSet interface
* (TransactionController)
* @param username Normalized authorization identifier
*
- * @returns true if match found
+ * @return {@code true} if match found
*
* @exception StandardException
*/
@@ -571,7 +571,7 @@
* normalized to internal form before comparison is performed
* against username, which is presumed normalized already.
* @param username Normalized authorization identifier
- * @returns true if match found
+ * @return {@code true} if match found
*/
private static boolean systemPropertiesExistsBuiltinUser(String username)
{
Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/DataDictionary.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/DataDictionary.java?rev=658612&r1=658611&r2=658612&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/DataDictionary.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/DataDictionary.java Wed May 21 02:55:34 2008
@@ -356,7 +356,7 @@
*
* @param authid authorizationId
* @param tc TransactionController
- * @returns true iff there is a matching schema
+ * @return true iff there is a matching schema
* @exception StandardException
*/
public boolean existsSchemaOwnedBy(String authid,
Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/util/StringUtil.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/util/StringUtil.java?rev=658612&r1=658611&r2=658612&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/util/StringUtil.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/util/StringUtil.java Wed May 21 02:55:34 2008
@@ -399,7 +399,7 @@
* string or delimited identifier have already been removed.
* @param source string to be compressed
* @param quotes string containing two single or double quotes.
- * @returns String where quotes have been compressed
+ * @return String where quotes have been compressed
*/
public static String compressQuotes(String source, String quotes)
{
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DataDictionaryImpl.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DataDictionaryImpl.java?rev=658612&r1=658611&r2=658612&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DataDictionaryImpl.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DataDictionaryImpl.java Wed May 21 02:55:34 2008
@@ -1640,7 +1640,7 @@
*
* @param authid authorizationId
* @param tc TransactionController
- * @returns true iff there is a matching schema
+ * @return true iff there is a matching schema
* @exception StandardException
*/
public boolean existsSchemaOwnedBy(String authid,
@@ -2841,8 +2841,8 @@
* <code>true</code> if there is a matching row
* (<code>EXISTS</code>)
*
- * @returns boolean action=EXISTS: return <code>true</true> if there is a
- * matching row else return <code>false</code>.
+ * @return action=EXISTS: return {@code true} if there is a matching row
+ * else return {@code false}.
* @exception StandardException
*/
private boolean visitRoleGrants(TabInfoImpl ti,
@@ -3025,8 +3025,8 @@
* <code>true</code> if there is a matching row
* (<code>EXISTS</code>)
*
- * @returns boolean action=EXISTS: return <code>true</true> if there is a
- * matching row else return <code>false</code>.
+ * @return action=EXISTS: return {@code true} if there is a matching row
+ * else return {@code false}.
* @exception StandardException
*/
private boolean visitPermsByGrantee(String authId,