From: scantor <scantor@cb58f699-b61c-0410-a6fe-9272a202ed29>
Date: Fri, 20 May 2011 00:47:30 +0000 (+0000)
Subject: https://bugs.internet2.edu/jira/browse/SSPCPP-372
X-Git-Tag: moonshot-old~1
X-Git-Url: http://www.project-moonshot.org/gitweb/?p=shibboleth%2Fsp.git;a=commitdiff_plain;h=c37551e0ba220107f76cfb519dc48396a371c876

https://bugs.internet2.edu/jira/browse/SSPCPP-372

git-svn-id: https://svn.shibboleth.net/cpp-sp/branches/REL_2@3431 cb58f699-b61c-0410-a6fe-9272a202ed29
---

diff --git a/odbc-store/odbc-store.cpp b/odbc-store/odbc-store.cpp
index 0e9c089..3260a62 100644
--- a/odbc-store/odbc-store.cpp
+++ b/odbc-store/odbc-store.cpp
@@ -1,11 +1,12 @@
 /*
- *  Copyright 2001-2010 Internet2
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to UCAID under one or more contributor license agreements.
+ * See the NOTICE file distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file to you under
+ * the Apache License, Version 2.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.apache.org/licenses/LICENSE-2.0
+ *       http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -532,7 +533,7 @@ int ODBCStorageService::readRow(
     if (pexpiration)
         q << ",expires";
     if (pvalue)
-        q << ",CASE version WHEN " << version << " THEN nullptr ELSE value END";
+        q << ",CASE version WHEN " << version << " THEN null ELSE value END";
     q << " FROM " << table << " WHERE context='" << scontext << "' AND id='" << skey << "' AND expires > " << timebuf;
     freeSafeSQL(scontext, context);
     freeSafeSQL(skey, key);