Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 31E01200CC4 for ; Wed, 28 Jun 2017 14:07:03 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 307A1160BFA; Wed, 28 Jun 2017 12:07:03 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 529D9160BF7 for ; Wed, 28 Jun 2017 14:07:02 +0200 (CEST) Received: (qmail 76830 invoked by uid 500); 28 Jun 2017 12:07:01 -0000 Mailing-List: contact commits-help@guacamole.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@guacamole.incubator.apache.org Delivered-To: mailing list commits@guacamole.incubator.apache.org Received: (qmail 76817 invoked by uid 99); 28 Jun 2017 12:07:01 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd2-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 28 Jun 2017 12:07:01 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd2-us-west.apache.org (ASF Mail Server at spamd2-us-west.apache.org) with ESMTP id CAA281AF8B3 for ; Wed, 28 Jun 2017 12:07:00 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd2-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -4.222 X-Spam-Level: X-Spam-Status: No, score=-4.222 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-0.001, SPF_PASS=-0.001] autolearn=disabled Received: from mx1-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd2-us-west.apache.org [10.40.0.9]) (amavisd-new, port 10024) with ESMTP id J0yMzjDOD3l6 for ; Wed, 28 Jun 2017 12:06:59 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-lw-eu.apache.org (ASF Mail Server at mx1-lw-eu.apache.org) with SMTP id 7710E5FAE1 for ; Wed, 28 Jun 2017 12:06:58 +0000 (UTC) Received: (qmail 76768 invoked by uid 99); 28 Jun 2017 12:06:57 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 28 Jun 2017 12:06:57 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 511FFE0885; Wed, 28 Jun 2017 12:06:57 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: vnick@apache.org To: commits@guacamole.incubator.apache.org Date: Wed, 28 Jun 2017 12:06:57 -0000 Message-Id: <8b15602b44634673a5ad5790bbbbefad@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/3] incubator-guacamole-client git commit: GUACAMOLE-320: Ensure blank values for the new text attributes of users and connections are properly interpreted. archived-at: Wed, 28 Jun 2017 12:07:03 -0000 Repository: incubator-guacamole-client Updated Branches: refs/heads/staging/0.9.13-incubating b21745568 -> de12b683d GUACAMOLE-320: Ensure blank values for the new text attributes of users and connections are properly interpreted. Project: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/commit/f7e64878 Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/tree/f7e64878 Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/diff/f7e64878 Branch: refs/heads/staging/0.9.13-incubating Commit: f7e648787e3af84a73c7abbcd5a60cf4425291bd Parents: ed066c8 Author: Michael Jumper Authored: Tue Jun 27 16:06:47 2017 -0700 Committer: Michael Jumper Committed: Tue Jun 27 16:31:29 2017 -0700 ---------------------------------------------------------------------- .../guacamole/auth/jdbc/connection/ModeledConnection.java | 4 ++-- .../org/apache/guacamole/auth/jdbc/user/ModeledUser.java | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/f7e64878/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connection/ModeledConnection.java ---------------------------------------------------------------------- diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connection/ModeledConnection.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connection/ModeledConnection.java index bcd7b11..7a7162e 100644 --- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connection/ModeledConnection.java +++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connection/ModeledConnection.java @@ -285,8 +285,8 @@ public class ModeledConnection extends ModeledChildDirectoryObject implements Us private void setUnrestrictedAttributes(Map attributes) { // Translate full name attribute - getModel().setFullName(attributes.get(User.Attribute.FULL_NAME)); + getModel().setFullName(TextField.parse(attributes.get(User.Attribute.FULL_NAME))); // Translate email address attribute - getModel().setEmailAddress(attributes.get(User.Attribute.EMAIL_ADDRESS)); + getModel().setEmailAddress(TextField.parse(attributes.get(User.Attribute.EMAIL_ADDRESS))); // Translate organization attribute - getModel().setOrganization(attributes.get(User.Attribute.ORGANIZATION)); + getModel().setOrganization(TextField.parse(attributes.get(User.Attribute.ORGANIZATION))); // Translate role attribute - getModel().setOrganizationalRole(attributes.get(User.Attribute.ORGANIZATIONAL_ROLE)); + getModel().setOrganizationalRole(TextField.parse(attributes.get(User.Attribute.ORGANIZATIONAL_ROLE))); }